This reverts commit 3a91500173. Conflicts: plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
3a91500173