Break and replace Galera server of same version
Imported upstream 5.5.36
Merge branch 'upstream'
Merged with upstream 5.5.36