Bringing back datastore attribute for Havana
Merge pull request #309 from mjura/release/roxy/vmware-datastore

[roxy] Bringing back datastore attribute for vmware