KNOX-349: Completes JSON and XML support for PUT/GET of single topology and collection.
Merge remote-tracking branch 'origin/apache-ref/master' into champlain