Add OS_TENANT_ID as authentication option

bug 1160898

Change-Id: I8849ab8f552801b8a317cd0394251c2db1ba8e9a
Merge "Add OS_TENANT_ID as authentication option"