No bug: add phrawzty and whimboo to relabs; a=orgonly
No bug: add hp7 to relabs nodes; a=orgonly
Bug 996583; upgrade vmware; r=arich
Merge default -> production

--HG--
branch : production