For ENG-5256, fix trailing whitespace