Fix merge conflict error from committing CMR r30420 to v1.7 branch.

Refs #4175