Changes for compatibility with exist 2.1 and updates in config files