Merge branch '2018.3' into m2crypto_test

.github/CODEOWNERS

@@ -1,14 +1,11 @@
 # SALTSTACK CODE OWNERS
 
 # See https://help.github.com/articles/about-codeowners/
-# for more info about CODEOWNERS file
+# for more info about the CODEOWNERS file
 
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-# See https://help.github.com/articles/about-codeowners/
-# for more info about the CODEOWNERS file
-
 # This file uses an fnmatch-style matching pattern.
 
 # Team Boto

salt/modules/file.py

@@ -5462,11 +5462,11 @@ def manage_file(name,
             # Write the static contents to a temporary file
             tmp = salt.utils.files.mkstemp(prefix=salt.utils.files.TEMPFILE_PREFIX,
                                            text=True)
-            if salt.utils.platform.is_windows():
-                contents = os.linesep.join(
-                    _splitlines_preserving_trailing_newline(contents))
             with salt.utils.files.fopen(tmp, 'wb') as tmp_:
                 if encoding:
+                    if salt.utils.platform.is_windows():
+                        contents = os.linesep.join(
+                            _splitlines_preserving_trailing_newline(contents))
                     log.debug('File will be encoded with %s', encoding)
                     tmp_.write(contents.encode(encoding=encoding, errors=encoding_errors))
                 else:

tests/integration/modules/test_service.py

@@ -25,6 +25,8 @@ class ServiceModuleTest(ModuleCase):
         os_family = self.run_function('grains.get', ['os_family'])
         os_release = self.run_function('grains.get', ['osrelease'])
         if os_family == 'RedHat':
+            if os_release[0] == '7':
+                self.skipTest('Disabled on CentOS 7 until we can fix SSH connection issues.')
             self.service_name = 'crond'
         elif os_family == 'Arch':
             self.service_name = 'sshd'