Refs #505.
Summary:
1. XML files not use tenantID.