FELIX-1269 FELIX-1387 cumulative patch submitted by Sahoo

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