Updated Pump Controller model to have unique parameter names.
Same as before but added witnesses to the master
Updates to generated common.h to add constants.