FELIX-3402 Applied a slightly modified version of the patch.

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