Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

tests/test_mig_shared_ssh.py

@@ -59,7 +59,7 @@ def test_ssh_key_generate_and_parse(self):
             except ValueError as vae:
                 #print("Error in parsing pub key: %r" % vae)
                 parsed = None
-            self.assertTrue(parsed is not None)
+            self.assertIsNotNone(parsed)
 
             (priv_key, pub_key) = generate_ssh_rsa_key_pair(size=keysize,
                                                             encode_utf8=True)