OAK-2166: CacheConsistencyTest may fail with IllegalStateException

Merge revision 1629814 from trunk

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