Updated to 6.1.2, cleanup makefiles, add note in UPDATING

Upstream has set collation type for MySQL to be implicit and
will cause issues when updating if tables are not set to
utf8_unicode_ci.

Approved by: lifanov (mentor, implicit)