Improve finishing feature branches

This replaces the existing *fin.sh scripts. We now simply delete the
local feature branch if it is fully merged into the parent branch.
Prior to that we fetch the changes and rebase the feature branch on
the parent.

Change-Id: I590f921419343377794045c6f77fa3c21d6144d8