SLING-3505 - Improve handling of updates to mapping (alias, vanity path)

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