[vcloud_director] Improve support for query service.
Merge pull request #2256 from nosborn/vcloud_director_queries

[vcloud_director] Improve support for query service.