Merge "Add keystone service endpoints to OpenStack labs"