LPS-34621 Update generated code (I know, that's bad, but Eduardo is going to fix the generator) so that we don't get generics warnings in Eclipse