#20506 for multitenant reports, route changes, maven build
Merge pull request #485 from jgunderson/master

#20506 for multitenant reports, route changes, maven build