Update the link in the tagcollector error message
Implement soft kill
Merge pull request #4183 from mmascher/softkill

Softkill