[WIP] BZ#1157340 - need to rerun puppet to deploy Heat

Marked WIP because i'm running one more test.