Merge proposals dependent on lp:~unifield-team/unifield-wm/sync-utp-872-various-fixes

lp:~unifield-team/unifield-wm/sync-utp-872-various-fixes has no merge proposals.