Merge branch 'jk/stash-require-clean-index' into maint

A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"