[DO NOT MERGE] Bug 1083544: Make membership changes reentrant