Merge "Fix wrong db catalog port in bpmn-infra"