Merge pull request DMPRoadmap#2569 from DMPRoadmap/development

v2.2.0 release candidate

Merge pull request DMPRoadmap#2560 from DMPRoadmap/bug/nil_useridenti…

…fier

fix a bug where UserIdentifiers were saved with nil user_id

Merge pull request DMPRoadmap#2441 from DMPRoadmap/development

Release Candidate v2.1.6

Merge pull request DMPRoadmap#2397 from DMPRoadmap/development

Sync Development for Release 2.1.5

Merge pull request DMPRoadmap#2267 from hugoecarl/pt_BR

Update translation support of pt_BR

trying explicit definition of db_services (DMPRoadmap#2195)

Merge pull request DMPRoadmap#2105 from DMPRoadmap/development

Development -> merge to Master

Merge pull request DMPRoadmap#2026 from DMPRoadmap/fix-rake-task

Fix upgrade rake task

Merge pull request DMPRoadmap#2025 from DMPRoadmap/merged

Merging development into master

fixed issue with args in translatable:find (DMPRoadmap#1963)

fixed issue with translatable text having a newline between the closing quote and the closing paren

fixed issues with translatable text in planscsv export and sharing notification

fixed issue with translatable on templates controller

fixed issue with multiline strings in translatable:find

fixed issue with multiline strings in translatable:find

cleaned up en-US translations