Merge branch 'dp/maint-rebase-fix' into maint

* dp/maint-rebase-fix: git-rebase--interactive: auto amend only edited commit git-rebase-interactive: do not squash commits on abort