Merge "corrected grompp rvdw charge-group radii check" into release-4-6