Update routeswitch to v0.6.1

Change-Id: I2b27cabbff055c96a3696c243abc1ced6d5bfd25