Merge "Update mysql configuration file to change sql_mode"