CELIX-187: added expire-handling, index for watch

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