Pull heat config and paste from upstream

Change-Id: I015c84f026fdcb3d324d58a55e68e932e3be5367
Merge "Pull heat config and paste from upstream"