uber openstack pep8/hacking fixes