Fix to wait for internal http server to complete transfer. Rework and simplify command line options.

SVN-Revision: 14098