The change from:
I01220077d8d25db5f69802ad27e745d90826d69b
In some way was lost by the gerrit. This patch just basically
redoes that work so the neutron agents will work properly.
Change-Id: I92ac1b8601d145a0722b37eda937ee2baac7a7c5
Closes-Bug: #1489664