FELIX-3927 - Make tests more reliable on KF

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