FELIX-3186 Applied the patch, with some improvements.

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