Merge "BUG 1016 - JSON|XML output with|without white chars"