(#23085) Ensure old puppet agents get properly stopped when upgrading from 2.6 or early to 2.7 or later