Modified neutron-server/common and nova-server/common to import keystone variables

This will ensure that the openstack_service_users map is populated in these roles as well

When overriden in the inventory, they will get overwritten everywhere, so this only helps
in the use case where using the role defaults
Merge remote-tracking branch 'upstream/master'