Merge "Glusterfs: use automatic mtime-based split-brain resolution"