LPS-32393
LPS-32393 Source formatting
LPS-32388 Simplify XML format used in the XMLStorageAdapter