BOM-448

python3 compatibility, tests fixes

cms/templates/settings.html

@@ -6,7 +6,6 @@
 
 <%namespace name='static' file='static_content.html'/>
 <%!
-  import urllib
   from django.utils.translation import ugettext as _
   from contentstore import utils
   from openedx.core.djangoapps.certificates.api import can_show_certificate_available_date_field
@@ -14,6 +13,7 @@
       dump_js_escaped_json, js_escaped_string
   )
   from openedx.core.djangolib.markup import HTML, Text
+  from six.moves.urllib import parse as urllib
 %>
 
 <%block name="header_extras">