BZ-996099: fixed check that disabled addition of all DataHolder fields to form.
Merge remote-tracking branch 'origin/6.0.x' into 6.0.x