Make undercloud-vm.yaml.

Updates to support using merge.py to de-dup the undercloud templates.

Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
Merge "Make undercloud-vm.yaml."