Comment 11 for bug 1250751

I'm running icehouse and this bug affects my ability to upgrade to juno (nova nodes are running ubuntu 12.04 so need to vacate nodes and reinstall for upgrade path)

I'd really love if someone could do the backport. My neive attempt to simply cherry-pick the commit into stable/icehouse didn't go so well. I'm unfamiliar with the code and likely made some poor choices resolving conflicts, but doesn't look like it should be much work for someone with slightly more clue.