Remove openstack.org from list of companies and fix affiliations

Some folks do commits from @openstack.org domain, all such commits
are treated as done by OSF, but in fact engineers affiliated with
different companies.

Change-Id: Ief0e27978ceb8eda548e99b91e0819a5f543b4ab