WIP: Resolve "NC has two mariadb pods"

Closed Arie Peterson requested to merge 431-nc-has-two-mariadb-and-one-postgres-pod into master