I will go ahead with merging this for artful/zesty/xenial as-is, notwithstanding Dimitri's above comment, because fixing this in trusty is not critical-path for any of our cloud images and I'm comfortable with us solving this differently (more complicated) as a trusty-only change later.
I will go ahead with merging this for artful/zesty/xenial as-is, notwithstanding Dimitri's above comment, because fixing this in trusty is not critical-path for any of our cloud images and I'm comfortable with us solving this differently (more complicated) as a trusty-only change later.