[BISERVER-8989] Tweaks to Caching EntryCollector to fit with Pentaho's custom ACL model
Merge pull request #470 from pentaho-nbaker/performance

[BISERVER-8989] Tweaks to Caching EntryCollector to fit with Pentaho's c...
BISERVER-8999 Fix exception on login.
Merge pull request #471 from jcaldwell/dev

BISERVER-8999 Fix exception on login.