Merge ~larsks/cloud-init:lp/1658200 into cloud-init:master

[Lars Kellogg-Stedman]

diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index 4f66767..44441e7 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -59,6 +59,7 @@ def _set_mock_metadata(gce_meta=None):
         else:
             return (404, headers, '')
 
+    httpretty.reset()
     httpretty.register_uri(httpretty.GET, MD_URL_RE, body=_request_callback)