Merge pull request #175 from atlasapi/film-merge-certs

Don't merge certificates on equivalent films
Add genericDescription flag to Content/Description.
Merge branch 'mbst-6780-ingest-generic-flag' into stage