Break codegen-server
's dependency on codegen-client
#2105
Merged
codegen-server
's dependency on codegen-client
#2105