Complete the removal of upgrade detectors See merge request !674 (cherry picked from commit 34d92fe1) f0151608 Complete the removal of upgrade detectors