Allow mixing constructor properties and parameters of superclasses.

[jangalinski]

Currently when we provide our own primaryConstructor for a builder supporting constructorProperties we get an error, because we have to decide between custom constructor and properties.
This is not right when overwriting a superclass, here we can mix params and properties and delegate values to the superClassConstructor.