Merge pull request #7962 from mikeller/increment_config_version_for_4_0