Revert "Remove the temporary deploy element after rename"

This reverts commit ac73660c4091d43d2750d269076d756cb30d9ca9.

This was a backwards incompatible change - it broke the stable tripleo-heat-templates job.

Change-Id: Ideffca203db7b860b9f9d96c1d9f73e046519ec7
Merge "Revert "Remove the temporary deploy element after rename""