Fix errors from a bad rebase

Refs #9842
Merge branch 'feature/9842_mc_absorb_hollow_cylinder' into develop