Merge "Fix error message for MySQL connection failures"