fixing merge from dev/issue-4769
Merge branch 'master' of git.artefactual.com:archivematica

Conflicts:
	src/MCPServer/debian/postinst