Fix #813

'opam switch reinstall' were reinstalling the wrong package set ...
Remove annoying check on 'opam switch reinstall'

So now you can reinstall the current switch.

As a side-effect, it makes the system upgrade work again.
Merge pull request #834 from samoht/master

More fixes