Merge proposals dependent on lp:~fabien-morin/unifield-server/fm-us-1167

lp:~fabien-morin/unifield-server/fm-us-1167 has no merge proposals.