FELIX-3292 Applied the second patch. Removed one callback signature that should have been removed, added @deprecated tags and some comments.

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