(#23085) Ensure old puppet agents get properly stopped when upgrading from 2.6 or early to 2.7 or later
Merge pull request #2035 from skottler/bugs/23085

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