Fixes #151 - Broadleaf should not load MultiTenant beans in non-MultiTenant scenarios
Fixes #152 - The admin should not load mixed-content files
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop