Merge "Aligning JSON marshalled output for Properties similar to the XML counterpart."