SOS-1571 Source formatting

For 6.1.x I will send this source formatting commit along with the rest of the 6.1.x backport