Merge pull request #29435 from galet/2015.8

Grains return wrong OS version and other OS related values for Oracle Linux

salt/grains/core.py

@@ -1030,7 +1030,7 @@ def _parse_os_release():
     with salt.utils.fopen(filename) as ifile:
         regex = re.compile('^([\\w]+)=(?:\'|")?(.*?)(?:\'|")?$')
         for line in ifile:
-            match = regex.match(line.strip('\n'))
+            match = regex.match(line.strip())
             if match:
                 # Shell special characters ("$", quotes, backslash, backtick)
                 # are escaped with backslashes