DG-741 - Added support for specifying COLLECTOR_PORT