OAK-2332 LIRS cache: deadlock if a value loader access the cache

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1644353 13f79535-47bb-0310-9956-ffa450edef68
OAK-2330 - Field boost not working if the property for indexing is picked using aggregate index rules

Merging 1644366


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