Merge branch 'stable-3.3' into master

* stable-3.3:
  Do not broadcast accounts_byname and accounts_byemail
  Remove use of IOUtils in tests

Change-Id: I68fcf5ee5b0472c3b06a7a2596c4537a3d267bd6