Update heat deployment to be tested

Change-Id: Ia495844acdb5731839421fd8f36f54084555321b
Merge "Update heat deployment to be tested"