Clean up local variable usage - TLS

Change-Id: I306a94a70e7d46afdc922983347b666fc4ea5be1
Clean up local variable usage - Trove

Change-Id: I935839a2175a83ad70e0a19754a79fb3d300b030
Clean up local variable usage - Nova

Change-Id: Ia4896746a2f574b7fcb95f85640e0d31c50c372b
Merge branch 'local-vars-heat' into dt-test
Merge branch 'local-vars-ironic' into dt-test
Merge branch 'local-vars-ceilometer' into dt-test
Merge branch 'local-vars-cinder' into dt-test
Merge branch 'local-vars-databases' into dt-test
Merge branch 'local-vars-glance' into dt-test
Merge branch 'local-vars-horizon' into dt-test
Merge branch 'local-vars-keystone' into dt-test
Merge branch 'local-vars-marconi' into dt-test
Merge branch 'local-vars-nova' 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 'local-vars-trove' 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