shrine

Pull request #1378: Bugfix/SHRINE2020 1303

Merge in SHRINE/shrine from bugfix/SHRINE2020-1303 to develop

* commit '2cb69d24e3b2e2085da3583c8af61140bd300422':
  stray merge bit
  Updating jmx tests for SHRINE2020-1303
  Shifted calls to the CRC to the CRC's execution context for SHRINE2020-1303