Merge "Remove tempest deprecated img_dir option"