LPS-32388 Simplify XML format used in the XMLStorageAdapter