Removed tenant id from URLs for barbican resources

Change-Id: Idc5c78356c203441cbcfff873cea571f63d37482
Merge "Removed tenant id from URLs for barbican resources"