FELIX-1988 Apply 21.assorted2.patch by Valentin Valchev (thanks)

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