SLING-3336 - applied Marius patch for multiple endpoints support

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