Merge pull request #2096 from stackhpc/feat/overcloud-push-local-then…

Merge pull request #2096 from stackhpc/feat/overcloud-push-local-then… #983