Remove hardcoded locations for tenant sites in Role/Site and Command/db