Merge pull request #371 from tamiko/dealii-8.2

cherry-pick commits to the release branch
fix configuration for step-34