Feature #2958: cli doc
Feature #1639: Change fault tolerance default options