fixing conflict in merge from 0.x branch
Merge branch 'stable/0.2.x' of git.artefactual.com:archivematica-storage-service into stable/0.2.x
adding copyright to debian files