Completes the work done for #14408 and #11432, which lets you add the --model-name option when generating scaffold controllers.

See commit message for details.