Typechecker should infer most general type for conditional expression's branches

[anton-trunov]

For instance, the following should typecheck:

fun foo(): Int? { return true ? 42 : null; }

This is a follow-up on #392.