Aviva investors upgrade Friends deal to so-so