Fix mariadb tests.
Merge pull request #3780 from mrunalp/bugs/origin-build

Merged by openshift-bot