Clean up local variable usage - cinder

Change-Id: Iedeafa15def1fa26d4ddcbc5f670129f66e38b9d
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-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