per-server control_port configuration
Merge commit 'da1d67dc1423426df393c94a8999fb6be8765e59' into feature/per-server-control-port
Merge 'feature/per-server-control-port' -> develop

Resolves pull-request #180