Capturing more uses cases for AMEC-2225
Merge remote-tracking branch 'origin/dev-AMEC-2225' into release/2.9.6rc
set version in pom to 2.9.6
Fix broken import.
Merge branch 'master' into release/2.9.6rc
Merge branch 'master' into dev-corrections

Conflicts:
	pom.xml
	src/main/java/org/ambraproject/article/service/XslIngestArchiveProcessor.java