Galera backports

These galera startup reliability issues have been fixed in master, issues: #411 #413