Merge conflict merging dev into feature/npsp-packages-upgrade

mrbelvedere tried to merge new commits to dev but hit a merge conflict.  Please resolve manually