added code for JSON response types (EUCA-9080)
Merge branch 'dev/ethomas/EUCA-9080' into testing