[FIX] test_converter: force inherit_branding by passing the right context
Merge branch 'master' of bzr::lp:openobject-server