magit-checkout-stage: enable not only during merge

We should limit this command to when it makes sense, but for that we
first have to determine when that is so.  For now always allow its use.
magit-checkout-read-stage: new function
magit-discard-item: offer to checkout side for unmerged files
Merge branch 'n/discard-unmerged' into next