shrine

Pull request #1404: Feature/SHRINE2020 1421

Merge in SHRINE/shrine from feature/SHRINE2020-1421 to develop

* commit 'a60eb5924485ce12f780f048520eac5787272d76':
  Some sad todos to reenable unit tests after we or slick takes care of some other bugs for SHRINE2020-1421
  Cleaned up some tests around Loggable for SHRINE2020-1421