New version of command line.
Will switch to this once the enterprise command line build is stable and
pushed to the snapshot repository in this release.
Merge branch '2.5-branch' into 2.5-branch-next/updated-execution-engine
Updated to use the new -inputdelimfile option of the 2.5.1 CLT.
Merge branch '2.5-branch-next/updated-execution-engine' into 2.5