JCR-3617: Inconsistent CachingHierarchyManager under concurrent access
- Merge fix into 2.2 branch

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.2@1511799 13f79535-47bb-0310-9956-ffa450edef68