Naming: use 'merge' instead of 'join'

[tbouffard]

The BPMN semantic usually use the 'merge' term.
So we should update the layout and waypoints implementation to use this term instead of 'join'.