Merge "Mark amazon image file config options deprecated"