Decreasing the Discolouration Risk of Drinking Water Distribution Systems through Optimised Topological Changes and Optimal Flow Velocity Control