Merge "Cleanup rpm-distro mariadb install"