Revert "removing /%(tenantid)s from tacker heat_uri"