Merge branch 'release-2.7.1'

Resolved conflicts

Merge branch 'release-2.6.1'

Prevent existing data from causing transformation issues with validat…

…ing submitted data

Merge branch 'release-2.5.1'

Merge branch 'release-2.5.0'

Merge branch 'release-2.4.0'

Merge branch 'release-2.3.0'

Prevented company migrations from stopping the upgrade if the migrati…

…on didn't get recorded for whatever reason.

Merge branch 'release-2.2.0'