Add 'opam upgrade --fixup' and print helpful messages when the universe is inconsistent

Not very satisfactory without an external solver though, the command will
just fail... We could fallback to removing any troublesome package but
that'd need more effort