Use canonical url (ie, self link's href) for embedded link values
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap

# By dragank
# Via dragank
* 'upstream-rdap' of github.com:APNIC-net/whois:
  Re-added deleted code due to patch
  Changed the way request urls are generated