Fix Python setuptools errors for Openstack and Google upload (acu111144)
Merge pull request #96 from rightscale/ivory_13_08_acu111144_fix_python_setuptools

Fix Python setuptools errors for Openstack and Google upload (acu111144)
Merge branch 'v13'
Merge branch 'master' of github.com:rightscale/rightimage_private