Bring mixer_paths.xml in line with CAF