BUG: CORE-2655.  Finishing up the work that franklin started to support
both the older pathToFTPControlFile argument as well as the new
pathToControlFile argument

Reviewed-by: franklin