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

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