Fill first nonfull container with 1 charge when diverting sewage samples

Fixes #2451

[s]This may [or may not] be a little OP[/s]