Fix the migration conflict

This patch fixes the conflict with the current master and our dynamic
routing branch.

Change-Id: If424dec2445eb7ae619676882932cbe1a3df3d3a
Signed-off-by: Taku Fukushima <tfukushima@midokura.com>