[vcloud_director] More mocking (1.8.7 compliant)
Merge pull request #2196 from nosborn/vcloud_director_more_mocks_18

[vcloud_director] More mocking (1.8.7 compliant)