Merge "Fix for broken galera connection"