Merge "Change to mariadb connector"