Bug 874589, cleanup ESX VM slave lists, r=bhearsum

--HG--
extra : rebase_source : 3c1ba6d5bc7bc77c358ce62eb0218ff10253b5c6