Fix special configuration handling and effective model retrival

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