fix up bug in how 3rd Party EntityType is looked up in PageCache
Merge branch 'develop'