Porting MN-251 to grizzly.

Porting MN-251 to grizzly, original patch for havana here -
https://github.com/midokura/neutron/
commit/fa7926ed54d554588f8ff886ea12fad34e6927dc