Merge "grompp now retains the order of bonds converted to constraints" into release-4-6