remove 'when_possible' merge policy tests and tweak log messages and logic a bit