Fixes #7450 - do not mark non-required fields

If validation is conditional we don't mark fields as required by
default. Also fixes disabling by override using :required option.