Fixed an issue that could happen in some cases of `opam switch import`
Merge pull request #1218 from OCamlPro/switch-import-solver-fix

Fixed an issue that could happen in some cases of `opam switch import`