switch internal mariadb client to version 2

and reenable it: hopefully the worst bugs are fixed now

Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b