MT#5891 wrap-and-sort
MT#5891 fix lintian warnings