Merge proposals dependent on lp://staging/~gmb/charms/oneiric/buildbot-master/tests-fixes

lp://staging/~gmb/charms/oneiric/buildbot-master/tests-fixes has no merge proposals.