Edits to my.cnf

Move settings from conf.d to my.cnf and add new settings to character
sets and collation section.