shrine

Pull request #1375: Feature/SHRINE2020 1362

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

* commit '9d599b90025d636b9a653109ee0a2d8b5b756ceb':
  Bill's review comments and a jmeter update for SHRINE2020-1362
  My review pass of SHRINE2020-1362
  More renaming of QUEUED query methods and some future tickets for SHRINE2020-1362
  Renamed to emphasize that the old messages are for QUEUED query updates only for SHRINE2020-1362
  Used the new UpdateResult messages in the adapter's not-queued query handling for SHRINE2020-1362
  Now able to receive and process the UpdateResult messsages for SHRINE2020-1362
  Update with results and try to unwind itemVersion conflicts - now in the hub db for SHRINE2020-1362
  First pass of the new result updates for SHRINE2020-1362
  Added UpdateResult to actually carry Results for SHRINE2020-1362
  Moved some json test files for SHRINE2020-1362
  Renamed existin result updates to BestEffort before creating full-state for SHRINE2020-1362
  Revert "Added a predicted item version for result updates for SHRINE2020-1362"
  Revert "Added an optional result id to messages about results for SHRINE2020-1362"
  Revert "Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362"
  Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362
  Added an optional result id to messages about results for SHRINE2020-1362
  Added a predicted item version for result updates for SHRINE2020-1362