Correct check of combination of VOMS with X.509.

The options structure has changed and the test needs to reflect that.
Be sure not to combine explicit tenant selection with VOMS
authentication.

When authenticating via VOMS, the site must determine the tenant from
the VOMS proxy certificate.