[3227] Return clearer message when cmdctl address+port is already in use
Merge branch 'trac3227'
[master] Delete trailing space and wrap ChangeLog messages to 80 columns
[master] Add ChangeLog for #3227