Better conflict resolution
Own logdir (bnc#792332)
Shorten install.inc, SLE11 can't handle long one
Few forgotten fixes from MySQL 5.6