Merge "Fix 'galera:master' mapping on all ctl nodes"