Regenerate the self url based on baseUrl so that error response have the right value where rdap.public.baseurl is set.
Merge remote-tracking branch 'origin/master'