Merge "[COMMON] Fix Portal MariaDB deploy error"