Add missing __git-hf-feature + misc other changes.