always abort rebasing

as its automated, we want to have a clean workspace afterwards
git rebase --abort before reset --hard, just in case, to clean up

Change-Id: I65d4a81bc3e640102f3eaa4d5a61c6511ce330cf