Merge pull request #8374 from bbodenmiller/7-5-update-fix

remove extra upgrade details, add missing config