Backport #16877 to 2014.7

Backport #16877 to 2014.7

Only the changes to `salt/cloud/clouds/digital_ocean.py` were backported as `digital_ocean_v2.py` does not exist on the 2014.7 branch.