fixed another singed/unsigned comparison warning/error
COMP: Merge branch 'bug-16236-final-version-for-master'