IDEAS-395 : Remove more dependencies for Jahia and improve XML code formatting