keep additional generics information when creating delegate for @Delegate
Merge branch 'delegate_generics' of https://github.com/paulk-asert/groovy-core into delegate_generics