Fixing SLING-3958, updating to add an integration test and fix the naming mismatch

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