Add Expire membership type for support team.
Fix conflicts.
Fix comments.
Add user another as support team
Merge branch '3875' of https://github.com/openscholar/openscholar into 3875
Fix test features.