TEZ-1411. Address initial feedback on swimlanes (gopalv)