Revert "Backport fix ups for Zed"

This partially reverts commit 1ae4324.

Author: priteau

glance/tests/unit/v2/test_tasks_resource.py

@@ -415,8 +415,8 @@ def test_create_with_wrong_import_form(self):
                        "non-local source of image data.")
             else:
                 supported = ['http', ]
-                msg = ("The given URI is not valid. Please specify a "
-                       "valid URI from the following list of supported URI "
+                msg = ("The given uri is not valid. Please specify a "
+                       "valid uri from the following list of supported uri "
                        "%(supported)s") % {'supported': supported}
             self.assertEqual(msg, final_task.message)