CB-6030 - Automatically increment port for serve when default is in use

Looks like GitHub is pretty far behind Apache Git. There is only 1 commit associated with this.

This finds a port not in use for 'serve' and cleans up the error handling.