Documented JSON outputter config options and fixed 'null' case
Merge pull request #15316 from basepi/bp-15300

Backport #15300 to 2014.1