Fix FELIX-4713
Applied proposed patch.

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