Merge "Fix galera.master and galera.slave enabling"