LPS-49294-SourceFormatter

This was a rebase problem - I now have the reverts in my local branch and have accounted for them.