Not all @openstack.org is affiliated with the foundation
Bunch of mapping updates