Apply path from Luke Winkenbach to fix FELIX-4612

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