Merge "Restart docker if mariadb fails to start"