Merge the command-line shell enhancements from trunk.  Other edits toward
trying to get ssdsim to run.

FossilOrigin-Name: 848f87e22fc6bfbbb7dbc7491c8a20cdd53b7420