converting db1021 to mariadb, adding db1058 to s1 for testing only

Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842