Revert "LPS-46944 SF"

This reverts commit 72c06dcd2f6c1b3975cad7874661d317559b1c38.
Revert "LPS-46644 - Source formatting"

This reverts commit d85938a16429c959b44b76effe5b636bf742bdf7.
Revert "LPS-46647 - Source formatting"

This reverts commit cc08240472ce943a5d4aece11be95a372fbb0ae5.
LPS-47094 SF
LPS-45197 use jdk6 notation until we mass change via SF