
It's possible that we're not allowing long enough time for mariadb to stop cleanly. https://github.com/docker-library/mariadb/issues/201 indicates that adding a stop time might be useful. The default is 10, bump it to 60. Change-Id: Id7a815d1508fe6d8f79818c9109cbf89533bb2a6