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