Merge "Add gerrit/smtp port config options to the doc"