Merge "make ansible container backward compatible"