Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev