Clean up local variable usage - upload_image()

Cleans up the rather coplex upload_image() function

Change-Id: Ie1ef200b905dd5d17ef887390d620817208f2bf5
Clean up local variable usage - misc functions

A catch-all for a bunch of smaller functions

Change-Id: I3f97a514f9964ef36bff2f24a2f0a98614871a9f
Merge branch 'local-vars-git' into dt-test
Merge branch 'local-vars-misc' into dt-test
Merge branch 'local-vars-upload' into dt-test
Merge branch 'local-vars-cinder' into dt-test
Merge branch 'local-vars-heat' into dt-test
Merge branch 'local-vars-ironic' into dt-test
Merge branch 'local-vars-nova' into dt-test
Merge branch 'local-vars-accounts' into dt-test
Merge branch 'local-vars-backends' into dt-test
Merge branch 'local-vars-horizon' into dt-test
Merge branch 'local-vars-keystone' into dt-test
Merge branch 'local-vars-stackforge' into dt-test
Merge branch 'local-vars-swift' into dt-test
Merge branch 'local-vars-tls' into dt-test
Merge branch 'usb-prereq' into dt-test
Merge branch 'conf-tempest' into dt-test
Merge branch 'test-service-functions' into dt-test
Merge branch 'exercise-refresh' into dt-test