The valves in the water pump compartment are not the bypass valves but, if they are the same as mine, are for winterizing. They would both be on the inlet side of the water pump, one valve going to the water tank (on for normal operation, off for winterizing), the other to a length of hose that can be used to suck out the antifreeze directly from the bottle. The location of the water heater bypass valves is different for different models, but they are likely where MikeA said for the 350.
Gary Shapiro, 2011 Georgetown 29' Class A
Dash, Molly & Lily - now at the Bridge and forever in my heart
Shadow - 4-year-old Greyhound
Hannah - 1 1/2-year-old GSD rescue