jaxrs now accepts custom json media type
Merge remote-tracking branch 'origin/upstream-rdap' into upstream-rdap