Recover mysql-upgrade dir/link handlig wrongly removed in f7caa041

The preinst is supposed to save possible mysql datadir link
and the postinst is supposed to recover it.

Also unify namig of the variables that reference the data
and log directories.