Fix ambiguous overload build errors

Refs #6972
Merge branch 'feature/6972_offlinehelp_integration' into develop