Code compliance changes from 21.3 which did not sweep to master

This is a large set of code complience changes that for some reason did not get swept into master.

This should bring the monitoring pakages in to line with 21.3