OS_TENANT_NAME and OS_TENANT_ID are legacy variables. so OS_PROJECT_NAME and OS_PROJECT_ID should be supported. Change-Id: Ibdfa0e14d80313b8087670ccd0bd9bdbf5ba364d Closes-Bug: #1591027