CELIX-138: Applied patch.

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

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