refs #8365. Fix issues around parameter maps.