Updates to the update-images.py script and utilities
Removed an autogenerated file and a pointless if/else statement in the openstack utilities
Merge pull request #1241 from pulp/jcline-update-image-builder

Updates to the update-images.py script and utilities