refs #9154. Fix warnings introduced with int.
Merge branch 'feature/poldi_changes' into develop