Merge "Don't set the failure extra on split install" into oc-dev