Fixed ERRAI-555: Marshalling gen. fails for constructor mappings with parameterized types