Merge branch 'local-vars' 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