Greg,
I agree that if there is a sub panel or service panel within 50/eyesight, then we would meet the code. However the service is in the basement and the house is finished, and they install a new water heater in the laundry room, Now what? Could you accept a lockable breaker(s) for the disconnect? Install a sign on water heater stating that the heater has multiple feeds?
