We allowed 'tenant_id' in catalog substitutions. The 'tenant' term is deprecated in favor of 'project'. Also allow 'project_id' so that users can stop using the deprecated term in one more place. Change-Id: I4bcfbda1b542f09172f5b53185f063c6bea27205