Improve key generation.
Merge branch 'trusty' of https://github.com/bprodoehl/mariadb55 into trusty

Conflicts:
	mariadb-start