SLING-3830 - applied Marius Petria's patch for reenabling multiple endpoints and multiple polling

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