Specify that tenants and flavors should include all tenants.

Fixes ZEN-13378
Clean up comments and whitespace
Merge pull request #24 from zenoss/feature/ZEN-13378a

Feature/zen 13378a