query vms with account name
Merge remote-tracking branch 'origin/multi-tenant' into multi-tenant