Issue #2335547 by DanChadwick: Fixed When viewing a submission, private components may be shown inappropriately and classes omitted.
Issue #2336445 by DanChadwick: Fixed Adding custom Wrapper CSS classes removes the "form-item" class.