master
bisync: add options to auto-resolve conflicts - fixes #7471
bisync: use unique stats groups on tests