Remove tenant ID from barbican API calls

Change-Id: I2767a8c02a9327acb4b4cb9111f7478ebadfb557
Merge "Remove tenant ID from barbican API calls"