Advertise the CLI TCP port even when we're going to show a 403
Avoid code duplication
Merge branch 'pull-850'