Use generic templates for displaying annotations
Simplify a field default value

Because the default value for the make_votable field is constant since
commit 37d5cdce22525cfeb3dfe1dbca9925046e3ec20f, it is no longer
necessary to have a function to calculate it.
MBS-7933: (add disc)
MBS-7933: (release duplicate)
Merge remote-tracking branch 'chirlu/mbs-7933' into beta

* chirlu/mbs-7933:
  MBS-7933: (release duplicate)
  MBS-7933: (add disc)
Merge remote-tracking branch 'nikki/templates-entity-annotations' into beta

* nikki/templates-entity-annotations:
  Use generic templates for displaying annotations
Merge remote-tracking branch 'chirlu/simplify_field_default' into beta

* chirlu/simplify_field_default:
  Simplify a field default value