Fix mysql option name and collation option

Only seemed to be an issue for new mysql installs
Newer mysql has different option name and charset
requires matching collation

Change-Id: I19f6e11814247bdce6049b19cf5df9049e0c748a