4228: fix arv_normalize input when a file in a subdir of a collection is being combined.
4228: fix arv_normalize input when a file in a subdir of a collection is being combined.
4228: add test for combining files from a collection subdir.
Merge branch 'master' into 4228-collection-subdir-files
Merge branch 'master' into 4228-collection-subdir-files

Conflicts:
	apps/workbench/test/integration/collections_test.rb
closes #4228
Merge branch '4228-collection-subdir-files'