Monitoring conditionals cleanup
Summary
Standardize
serviceMonitor
conditionals everywhere
See
!2962 (comment 2169627428)