AN OPTIMIZATION MODELLING TOOLKIT FOR COMPLEX WATER SYSTEMS WITH THE CONJUNCTIVE USE OF CONVENTIONAL AND MARGINAL WATER SOURCES