Address differences in conf/archive_*.yml between 'dev_cross' and master branch