Merge "Revert "Fallback added for: pillar.galera.(master|slave).admin.user pillar.galera.(master|slave).admin.password""