Merge "BUG-672 Make Xml directory adapter skip initial config files with invalid...