Remove newlines from master and slave help messages.

Review: https://reviews.apache.org/r/27588
Updated docs/configuration.md to reflect current state.

Review: https://reviews.apache.org/r/27556