db1006 (s6) -> file_per_table, mariadb

Change-Id: I7d9a53db1dddd6bf45232c331aa584bcc100514c
Merge "db1006 (s6) -> file_per_table, mariadb" into production