Commiting to prepare for a rebase

refs #17091