Steve, please ignore the 'barbican/openstack/....' files....they are copy/pasted in via a tool that oslo-incubator provides, and will (hopefully) eventually be packaged and versioned dependencies.