Merge "Upgrade and add mariadb artifact"