atmire-1755: Assembly file fix
Merge remote-tracking branch 'origin/atmire-1755-2' into dryad-staging

Conflicts:
	dspace/src/assemble/assembly.xml