Comment 5 for bug 1686768

I ran some extra QA over the fix as I prepared it for Artful and all tests were good, so pushing there to fix the current development release - it should be in artful-proposed soon and auto-close here once (hopefully) migrating cleanly.

From there as I outlined it is about preparing and verifying extra cautiously for the stable release updates - I'll add tasks for this.