Merge "Use configured mysql host"