SD-404 : Write more behave tests, especially for error flows
Merge branch 'master' of https://github.com/ioanpocol/superdesk-server

Conflicts:
	superdesk/archive/archive_ingest.py