Update whois docs and options
Merge branch '2.9/update-whois-config' into 2.9-trunk