fix cleanup
Merge branch 'develop' of https://github.com/zenoss/europa-dev into develop