remove openstack, change toplevel class for hp1; a=orgonly
Merge default -> production

--HG--
branch : production