Revert #30217 - was causing salt-cloud -a breakage

[rallytime]

Reverts #30217

Fixes #30950 and #31059

[nmadhok]

@rallytime Can you also include the changes to the VMware cloud driver that were suggested originally?

[rallytime]

@nmadhok I'd rather not right now, as we're trying to get a release out, and the less churn we have for that release, the better. I tested the functions in question, and they're working just fine with only this change. I can address the other changes in another pull request.

Here's the output of those functions, running on this branch:

# salt-cloud -a create_snapshot test_ub14 snapshot_name="snap-test-1" -y
[INFO    ] salt-cloud starting
[INFO    ] [ test_ub14 ] Waiting for create snapshot task to finish [0 s]
[INFO    ] [ test_ub14 ] Successfully completed create snapshot task in 3 seconds
vmware-config:
    ----------
    vmware:
        ----------
        test_ub14:
            ----------
            Snapshot created successfully:
                ----------
                created:
                    2016-02-09 14:28:02
                description:
                name:
                    snap-test-1
                path:
                    /Test3cloud/Test3cloud/Test4cloud/Test4cloud/mySnapshot/mySnapshot/snap-test-1/snap-test-1
                state:
                    poweredOff
root@vagrant-ubuntu-trusty-64:~# salt-cloud -a revert_to_snapshot test_ub14 power_off=True
[INFO    ] salt-cloud starting
The following virtual machines are set to be actioned with "revert_to_snapshot":
  test_ub14

Proceed? [N/y] y
... proceeding
[INFO    ] [ test_ub14 ] Waiting for revert to snapshot task to finish [0 s]
[INFO    ] [ test_ub14 ] Successfully completed revert to snapshot task in 3 seconds
vmware-config:
    ----------
    vmware:
        ----------
        test_ub14:
            reverted to current snapshot