merge from trunk: 65451 (never throw ex if event log bug in click-once)