Comment 5 for bug 1699179

I have a branch with the updated diff, thanks @simpoir.

While building, I noticed that the unit tests have several failures in releases >= zesty (not introduced by this fix). I would like to see these passing before our next upload: https://bugs.launchpad.net/landscape-client/+bug/1736576