revert to x-rpc-json
Merge remote-tracking branch 'origin/q_object_support' into q_object_support