Merge admin_cns_merge_members into admin_cns_members; no good reason this...

Merge admin_cns_merge_members into admin_cns_members; no good reason this should be separate, and is necessary for proper conflict resolution