Use the image id as name is not unique for DigitalOcean images.

Conflicts:
	salt/cloud/clouds/digital_ocean_v2.py
Merge pull request #16897 from rallytime/bp-16877

Backport #16877 to 2014.7