Next batch of code complience changes
Many small code compliance issues fixed by way of incorporating the changes in master so that the two code can be swept from 21.3 to master
All the changes here are essentially just changes that are already in master plus a few extra that were missed in master, as we are trying to synchronise the code between 21.3 and master
Edited by Mark Sutton