CELIX-140: Applied patch

git-svn-id: https://svn.apache.org/repos/asf/celix/trunk@1620371 13f79535-47bb-0310-9956-ffa450edef68
CELIX-142: Applied patch

git-svn-id: https://svn.apache.org/repos/asf/celix/trunk@1620372 13f79535-47bb-0310-9956-ffa450edef68
Fixed some small issues

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