Simplify branch diagram

- remove 3.1.4
- we never merge between vX.Y-dev branches, they diverge too much