OAK-2174 Non-blocking reindexing doesn't finish properly
 - merged rev 1630773



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