Merge tag 'upstream/5.5.43' into ubuntu-14.10

Upstream version 5.5.43

Conflicts:
	debian/dist/Ubuntu/mariadb-server-5.5.postinst
	debian/mariadb-server-5.5.install