shrine

Pull request #1516: Feature/SHRINE2020 1642

Merge in SHRINE/shrine from feature/SHRINE2020-1642 to feature/SHRINE2020-1218-cats-effect-upgrade

* commit 'ca1d4d2ecd6c0d77e75f8c2e9e7abc7dd4bb3289':
  Code review suggestion from Xav for SHRINE2020-1642
  Last comment cleanup for SHRINE2020-1642
  Maybe restored Kafka for SHRINE2020-1642
  Start of restoring Kafka for SHRINE2020-1642