Revert "[vcloud_director] More mocking."

This reverts commit b19f2f0e7eddb80eb78d65757fb2dfbb8db19dd0.

Seems to contain a 1.9-ism, backing out until found.
Merge pull request #2194 from nosborn/vcloud_director_1648c933e0

Revert "[vcloud_director] More mocking."