FELIX-4402 remove commented out code, improve generics, reduce eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1602650 13f79535-47bb-0310-9956-ffa450edef68
FELIX-4401 reimplement ScrInfo based on DTOs

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