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