Comment 8 for bug 1729858

Tested for this bug from https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3027
Worked for zesty and xenial with the fix as Jürg had already initially reported (was still worth to check before upload).

Basic (single arch) regression check on the ppa done as well to ensure we are not accidentally regress on another part due to the change.

That said, all is ready uploading into -unapproved for the SRU team to review.