Merge "Fix check for MariaDB upgrade manual switch off"