MDL-18177 - fixing whitespace issues