Second version of Release Candidate for HF25.

Consensus changes

New command-line options

Bug fixes

Miscellaneous changes

Miscellaneous code and documentation cleanup