Fix response to generate json for some responses that aren't currently in json format
Merge remote-tracking branch 'origin/v0.6.2-cvent' into v0.6.2-cvent