Fix some quoting, especially of constructs like "[address:]port", that
were proving tricky for Asciidoctor tooling to parse correctly.

Also fix formatting of some configuration variable names that
contained double underscores.  Neither asciidoc nor asciidoctor was
rendering some of those correctly.

Part of ticket 32708.