Merge "Update Heat CLI test to pass with random hash"