Basic tests for import and fix for additional branches

Some simple tests to ensure the basic command line behaviour of the
import sub-command is correct and also fix the failure to detect the
dropped additional branch on next import.

Change rebaseeditor script to ensure that exceptions from running
git-var are ignored.

Change-Id: I23f7e0798130335cac5882f4357eb8094f72f7af