Refs #10383 fixing some cpp check warnings
Merge branch 'feature/10383_fits_workspace' into develop