Fix gcc7 deprecation warnings

Marco Cattaneorequested to merge
cherry-pick-fd934753 into hlt2016-patches

cherry-pickd from !651 (merged)

Merge request reports