Heat: Remove JSON trailing commas that don't parse

Change-Id: Ia642716f30ea4bd098e5c67e522bbfd01fd6cf7a
Merge "Heat: Remove JSON trailing commas that don't parse"