Builder methods return type is missing generics typed

[jiri-meluzin]

Previously the generated classes contained methods builder with no type returned generic base builder class. When I used such return value from builder the compiler complained about type of that generic class.

see #1587