Merge "Support files removed for CONF.scenario.img_dir option"