fix erroring in smoketest
Merge pull request #312 from jdsn/fix-smoketest-erroring-roxy

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

[roxy] Bringing back datastore attribute for vmware