Merge "Test SIOCKILLADDR on non-empty addresses too."
am: fa61997537

* commit 'fa6199753778e95a001400afa092a98395062ec9':
  Test SIOCKILLADDR on non-empty addresses too.