Create collaboration membership model and table, update collaboration

[#79005958]
Merge in upstream changes in master. Manual tweak to schema.rb