Incorporating Additional Resilience Measures through Operational and System Control Strategies now that the Design is Complete for the Willamette Water Supply System