Bug 1001517: set up hp4 as toplevel::server; a=orgonly
Merge default -> production

--HG--
branch : production