Forward port of invalidation changes from zenoss-4.x
Merge pull request #108 from zenoss/feature/-8010

Forward port of invalidation changes from zenoss-4.x