[MRG] Port of ocb-server specific changes to git. Basically a diff of lp:ocb-server/7.0, revno 5345 against lp:openobject-server/7.0, revno 5308