Revert client colours to their preferred colours after the map is changed to a map which doesn't lock colours.
Merge pull request #2714 from ScottNZ/lobby

Revert client colours to their preferred colours after the map is changed