SLING-2868 :  Improve and cleanup implementation : use correct discovery modules

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