Fill container entirely when diverting sewage samples

Fixes #2451