Refs #4479: Fix merge in branch 2.8