control-port-filter: use ControlSocket rather than ControlPort; refactoring; comments
bumped version number
Merge remote-tracking branch 'origin/master'