Add observability variables and provision for avoiding OCSP conflicts