Fix FTKSim compiler warnings and style violations
This merge request cherry-picks two fixes by @baines to compiler warnings and style violations, from the pseudo-merge of FTK changes to master (!23646 (merged)).
This merge request cherry-picks two fixes by @baines to compiler warnings and style violations, from the pseudo-merge of FTK changes to master (!23646 (merged)).