dee

Merge proposals dependent on lp://qastaging/~kamstrup/dee/test-fixes

lp://qastaging/~kamstrup/dee/test-fixes has no merge proposals.