MT#6839 fixing lintian errors/warnings