MDL-35717|NOBUG - fix trailing whitespace problems