[Trusty SRU v2] Fix for LP: #1410852

[Stefan Bader]

Chris had submitted those a while ago, but the 3rd patch seemed wrong
and I just re-ran the backport and the cherry-picks. #1 applied with
a bit of fuzz. For #3 its more or less fuzz, too. Just a bit too much
for auto-handling it. At least the last hunk is not supposed to replace
a function.

Compiled those 3 on top of current stable and could see the error
go away with the described test-case.

-Stefan