[Fix Bug 938723] Dan wray join groups combined branch

This is an unsquashed set of commits to multiple branches that Dan and I merged into one branch to satisfy Bugs 938723 and 948491

https://bugzilla.mozilla.org/show_bug.cgi?id=938723
https://bugzilla.mozilla.org/show_bug.cgi?id=948491