MOCCACAL-57: Cannot have several calendars on one page

* fix the calendar counter
* also avoid unneccesary whitespace / linebreaks above the calendar
* fix typo in update url (contained a lone '}', likely from fixing MOCCACAL-49
MOCCACAL-52: Including a Mocca Calendar page via the display-macro crashes the WYSIWYG editor

* prevent entering edit mode if we smell from the request it is not
  the calendar doc itself that got edited.
  somewhat desparate attempt to fix it including request path sniffing
  and PR to change the display mode