Added mariadb dockerfile. Minor other changes
merged from master