Merge "Heat test to launch a heat-cfntools based instance."