Bug 996583: install vmware tools in QA, too; a=orgonly
Merge default -> production

--HG--
branch : production