Fix FELIX-3461 - Issue with collected metadata and manipulation metadata on re-manipulation

* Fix the constructor argument shift by not moving the annotations
* Fix the method name when it is a manipulated method
* Cleanup the manipulation metadata

(forgot to add files in my first commit)

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