Getting RDAP T&C properties up and running
Merge remote-tracking branch 'origin/upstream-rdap' into upstream-rdap