working on the unit tests all that is left are the maintenance windows
fixed maintainence window tests
Merge pull request #390 from zenoss/feature/ZEN-13336

Feature/zen 13336