fixing conflict in merge from 0.x branch
fixing conflict in merge from 0.x branch

artefactual/archivematica-storage-service,artefactual/archivematica-storage-service,artefactual/archivematica-storage-service,artefactual/archivematica-storage-service