EPANET Upgrade from 2.2 to 2.3

To start, here's the diagram we created for the previous version upgrade and history merging:

My immediate steps before performing the upgrade were the following:

1. Create a branch that's a copy of gqc branch (previously merged code) for version 2.2
2. Create a branch that's a copy of the owa_dev branch for version 2.2
3. Create a branch for OWA's 2.3 version
4. Merge owa_2.3 into owa_dev
5. Create a branch for GQC's 2.3 version

Then to perform the upgrade, I merged owa_dev (which matches owa_2.3) into gqc_2.3.

Here are the files that require manual merging: