PROC-157 - Support the use of inner classes in generated code
PROC-157 - Generated code features both flavors of the context argument, so just replace it in the template
Merge branch 'PROC-157' into 'master'

PROC-157 - Support the use of inner classes in generated code

See merge request !10