Merge proposals dependent on lp:~marrakis/openobject-server/setup-clean

lp:~marrakis/openobject-server/setup-clean has no merge proposals.