Issue #3476905: Required field indicator appears twice

Malcolm Youngrequested to merge
issue/conditional_fields-3476905:3476905-required-field-indicator into 4.x

Closes #3476905

Merge request reports