Update include guards to match class names. Refs #8900.
Merge branch 'feature/8900_improve_icat_algorithms' into develop