[FELIX-3396] Fix more cases, patch from Forrest Xia

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