Merge "Rename deprecated/unsupported options in my.cnf.pre"