shrine

Pull request #1408: Feature/SHRINE2020 1404

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

* commit '670914de613737677dfa05300f1b6f8f4b48400e':
  Cleared a bunch of printlns from tests while sitting in a parking lot trying not to look too seedy for SHRINE2020-1404
  Cleared up the version conflicts for SHRINE2020-1404
  Use the parameter for the javax servlet api for SHRINE2020-1404
  Sorted the properties in the pom.xml for SHRINE2020-1404