Revert "X Adjust NEO/go to neo:// URL change + py fixups"

This reverts the py part of 8c974485.
go parts of this patch are handled in 70c0a984e03083ea35678de9ac7599a2364a355d.

neo/tests/client/testZODBURI.py

@@ -42,7 +42,7 @@ testv = [
 """,
      {}),
 
-    ("neos://ca=qqq;cert=rrr;key=sss@[2001:67c:1254:2a::1]:1234,master2:port2/db4?read_only=false"
+    ("neos://ca:qqq;cert:rrr;key:sss@[2001:67c:1254:2a::1]:1234,master2:port2/db4?read_only=false"
      "&compress=true&logfile=xxx&alpha=111&dynamic_master_list=zzz"
      "&beta=222",
      """\

setup.py

@@ -104,8 +104,7 @@ setup(
             'stat_zodb=neo.tests.stat_zodb:main',
         ],
         'zodburi.resolvers': [
-            'neo  = neo.client.zodburi:resolve_uri [client]',
-            'neos = neo.client.zodburi:resolve_uri [client]',
+            'neo = neo.client.zodburi:resolve_uri [client]',
         ],
     },
     install_requires = [