use JSONObject.NULL for null values so that they appear explicitly in the json
use JSONObject.NULL for null values so that they appear explicitly in the json
Merge branch 'aitfive-39' into qa