MDL-29614 whitespace fixes