Solved some remaining conflicts after rebasing mcast-forward on ccports.