[CM-441] Deploy new version of common-files to all 5.0 projects
subfloor push associated with CM-447
prd-3965 added a merge strategy for fields and tags.
Merge pull request #21 from gretchiemoran/master

prd-3965 added a merge strategy for fields and tags.