Fix upgrade. (#6792)
Fix upgrade. (#6792)

* Fix upgrade.

* Format

* Move back the fail close - not clear if we have time to get mixer client in this build, we can remove in next

geeknoid/istio,istio/istio,frankbu/istio,geeknoid/istio,smawson/istio,frankbu/istio,istio/istio,smawson/istio,geeknoid/istio,geeknoid/istio,istio/istio,smawson/istio,frankbu/istio,frankbu/istio,smawson/istio,smawson/istio,frankbu/istio,geeknoid/istio,smawson/istio,istio/istio,frankbu/istio,geeknoid/istio,istio/istio