Merge conflict merging dev into feature/1045-ref-cumulusci

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