Cloner: add upgrade test

This is the 'test_grenade_forward' and 'test_upgrade_backward'
tests from d-g.  Both scenarios are covered because they both
simulate havana->master upgrades, just changing which of them
is the 'current' change.  Since we examine the states of all
changes, in the course of running the test we check the results
for both when a current change is havana and master.

This also covers the 'test_branch_override' case from d-g.

Change-Id: I95abd62279bd44e88a608ad908f4876d11d50ec2
diff --git a/tests/base.py b/tests/base.py
index 4ba88fb..46c7087 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -849,6 +849,8 @@
         self.init_repo("org/project2")
         self.init_repo("org/project3")
         self.init_repo("org/project4")
+        self.init_repo("org/project5")
+        self.init_repo("org/project6")
         self.init_repo("org/one-job-project")
         self.init_repo("org/nonvoting-project")
         self.init_repo("org/templated-project")