* Align connectUsers to mls branch

There have been some diverging changes on the mls branch related to the
way users are created and connected in tests. This aligns the version on
develop with that on mls.

* Rename connectUsers2 → connectTwoUsers