Merge conflict merging master into feature/configure-cumulusci

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