remove some caching, also remove startup errors
fix null reference
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Remove unserializable interface EntityRef from PathQuery.