Merge "Added logging when a heat stack fails."