SLING-3456 - missing changes on replication/core from Marius patch

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1578925 13f79535-47bb-0310-9956-ffa450edef68
SLING-3456 - missing changes on replication/core from Marius patch

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