The changes should allow ithe install of either a utf8 or utf8mb4 site

behatnotneeded

Change-Id: I23479c50f2dc2ac197f244cf723a60e79f88c561
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>