FELIX-3906 Apply patch by Robert Munteanu (thanks alot)

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