Merge pull request #49646 from rallytime/merge-2018.3

[2018.3] Merge forward from 2017.7 to 2018.3

salt/modules/network.py

@@ -1140,7 +1140,7 @@ def convert_cidr(cidr):
     ret = {'network': None,
            'netmask': None}
     cidr = calc_net(cidr)
-    network_info = salt.ext.ipaddress.ip_network(cidr)
+    network_info = ipaddress.ip_network(cidr)
     ret['network'] = six.text_type(network_info.network_address)
     ret['netmask'] = six.text_type(network_info.netmask)
     return ret

tests/integration/modules/test_grains.py

@@ -12,7 +12,7 @@ import time
 # Import Salt Testing libs
 from tests.support.case import ModuleCase
 from tests.support.unit import skipIf
-from tests.support.helpers import destructiveTest
+from tests.support.helpers import destructiveTest, flaky
 
 log = logging.getLogger(__name__)
 
@@ -182,6 +182,7 @@ class GrainsAppendTestCase(ModuleCase):
 
         assert msg == ret
 
+    @flaky
     def test_grains_append_val_is_list(self):
         '''
         Tests the return of a grains.append call when val is passed in as a list.

tests/unit/serializers/test_serializers.py

@@ -102,7 +102,7 @@ class TestSerializers(TestCase):
 
     @skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
-    @flaky
+    @skipIf(six.PY3, 'Flaky on Python 3.')
     def test_compare_sls_vs_yaml_with_jinja(self):
         tpl = '{{ data }}'
         env = jinja2.Environment()