Merge branch '2018.3.3' into '2018.3'

Conflicts:
  - tests/integration/states/test_file.py

pkg/osx/shasums/openssl-1.0.2n.tar.gz.sha512

@@ -1 +0,0 @@
-144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687  ./openssl-1.0.2n.tar.gz

tests/integration/states/test_file.py

@@ -2277,7 +2277,9 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
             if salt.utils.platform.is_windows():
                 import subprocess
                 import win32api
-                p = subprocess.Popen(salt.utils.stringutils.to_str('type {}'.format(win32api.GetShortPathName(test_file))),
+                p = subprocess.Popen(
+                    salt.utils.stringutils.to_str(
+                        'type {}'.format(win32api.GetShortPathName(test_file))),
                     shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 p.poll()
                 out = p.stdout.read()

tests/integration/states/test_pip_state.py

@@ -338,6 +338,7 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
 
     @destructiveTest
     @skip_if_not_root
+    @skipIf(salt.utils.platform.is_darwin(), 'Test is flaky on macosx')
     @skipIf(not CAN_RUNAS, 'Runas support required')
     @with_system_user('issue-6912', on_existing='delete', delete=True,
                       password='PassWord1!')

tests/integration/states/test_virtualenv_mod.py

@@ -28,6 +28,7 @@ from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
 
 @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
 class VirtualenvTest(ModuleCase, SaltReturnAssertsMixin):
+    @skipIf(salt.utils.platform.is_darwin(), 'Test is flaky on macosx')
     @destructiveTest
     @skip_if_not_root
     def test_issue_1959_virtualenv_runas(self):

tests/unit/utils/test_stringutils.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 from __future__ import absolute_import, print_function, unicode_literals
 import re
 import sys