Refs #6141 - Bug fix for river parameters
Minor refactoring in group edit form