[gh-846][gh-806] Reinstate $og_membership 'user' check with entity_type

b39f43c was likely a bug using group_type