Fix make dist.

Refs #4976
Merge branch 'feature/make-dist-4976' into next

Fixes #4976