CELIX-169: add proper clean up

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