db1039 to s6, plus switch to mariadb

Change-Id: I0eecbff67c90a8505d86ebe888a6f6cb337147a8