SLING-3897 - fixing synchronization block error

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1621289 13f79535-47bb-0310-9956-ffa450edef68
SLING-3730 : ResourceResolver does not always set the metadata "sling.resolutionPath" properly

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1621290 13f79535-47bb-0310-9956-ffa450edef68