Merged from trunk to pick up work in progress and a bug fix to tester.tcl....

Merged from trunk to pick up work in progress and a bug fix to tester.tcl. Fixed issue introduced by the addition of the insertCsrf and verifyCsrf commands from ci [f8820eff] which broke the test th1-info-commands. Also fixed the dependence on the order of commands output by TH1.

FossilOrigin-Name: 2de15c8e3b85ccc6f4aa51cf79de75390e2495bf