SLING-2915 - Infrequent NPE in resourceresolver

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