Bug 1083544: Make membership changes reentrant

@smarterclayton @abhgupta review please