Merge branch 'mlxsw-router-fixes'