Merge branch 'area-containment-optimize-master'

* area-containment-optimize-master:
  Optimize area containment information by using a query with fewer CTEs.
Merge remote-tracking branch 'ocharles/mbs-6902'

* ocharles/mbs-6902:
  MBS-6902: Filter object_to_ids to only operate on defined objects
Don't use RDFa made links in edit display.
Merge branch 'master' into beta