Backport salt-cloud ec2.py dict key fixes.

@techhat ping!