#2350591 Add the not a spammer role to Association members
#2350591 Expand comments and query cleanup.
Merge branch '2350591-not-spammer-role' into dev