Fix compilation warnings
Exposed by change in compilation flags in the nightlies (cherry picked from commit 4a769e1d)
To be cherry-picked to stripping24r2-28r2-patches branch
Edited by Marco Cattaneo
Exposed by change in compilation flags in the nightlies (cherry picked from commit 4a769e1d)
To be cherry-picked to stripping24r2-28r2-patches branch