Applied patches in FELIX-2911 with some small changes. Should compile without problems now.

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