As I commented in the PR, I think Tenant ID should be extended to 40 characters.  This will allow the whole ID from OpenStack Folsom/Grizzly to be visible.