Merge "vCPE Infra and Metro HEAT Templates Issue-Id: UCA-32 Change-Id: I273403a81f33e...