Move JSON compatibility right along couchdb storage
Merge move_json_compatibility_to_couchdb — Fix conflict regarding Python3 support