shrine

Pull request #1421: SHRINE2020-1467 back-end: pass TOU from config file to the front end

Merge in SHRINE/shrine from SHRINE2020-1467-back-end to develop

* commit 'e7a8e6485715bf364ea8664781552fee48493263':
  SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Removed comments for shrine.conf used in qep service tests
  SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Made termsOfUseText webclient config not optional
  SHRINE2020-1467 - Configurable text for TOU Acknowledgment- Cleanup shrine-setup configs
  SHRINE2020-1467 - Configurable text for TOU Acknowledgment
  SHRINE2020-1467-back-end last bits from the PR
  SHRINE2020-1467 back-end: improvements as per PR: do not set termsOfUseText where it already has a defaukt value
  SHRINE2020-1467 back-end: pass TOU from config file to the front end