[Bug 836383]=?UTF-8?Q?=20Merging=20teams=20and=E2=80=A6=20zanata=20or=20TXN?=?!