Try to merge CB patch into joined client/server. Failures because of new import statements.
rangeapply: make local variable renaming optional, and generalize parameter names

First step towards making the remapping script work for porting mods, instead of only for porting CB to MCP.
Make --mcpConfDir optional, as its only used for renaming method parameters
Dry run merging client/server