Fix whitespace changes made during conflict resolution (no bug) DONTBUILD

--HG--
extra : amend_source : 5aa8910ac61d7b9335de315f1caee041eac4271e