Make sure to kill old diamond process even if killproc fails. Otherwise
we end up with multiple diamond processes reporting.
Merge pull request #687 from kloeri/master

Make sure to kill old diamond process even if killproc fails.