Fixed HISTORY.txt markup

* Bug fix: fixed HISTORY.txt RST markup
  [ghicaale refs #14321]
Changed the following:

- Removed documentation entry regarding use of macros since as of 2.0
  we load the template through ajax
- Add document to globals to avoid jslint error
Fixed merged conflict
Prepare eea.uberlisting 2.1.
Updated version for eea.uberlisting to 2.2-dev
Merge remote-tracking branch 'collective/master'