WEB-11293 XML configuration files inconsistent element ordering