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

Author: jonasbardino

mig/user/selenium/userguidescreens.py

@@ -43,13 +43,17 @@
     print("Failed to import future module - missing install?")
     exit(1)
 
-from urllib.parse import urlparse
 import getpass
 import os
 import sys
 import time
 import traceback
 
+if sys.version_info[0] >= 3:
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+
 try:
     from mig.user.selenium.migcore import init_driver, ucph_login, mig_login, \
         shared_twofactor, shared_logout, save_screen, scroll_to_elem, \