Fix tests in membership broken by the SNAPSHOT common build

With some of the recent updates to the common lib, some of the local tests broke. The common version was reverted to address this, with some of the fields added to commons migrated to this package as they should have been here initially.