Add collection to entity_type macro
Use common edit listing template for collections
Merge remote-tracking branch 'chirlu/mbs-1951' into beta

* chirlu/mbs-1951:
  Use common edit listing template for collections
  Add collection to entity_type macro