Rebasing tree on lp:python-dbusmock