Merge proposals dependent on lp:~mwhudson/launchpad/test_traverse-set-participation-bug-611570

1. test_traverse-set-participation-bug-611570
2. Dependent merge proposals