forcibly kill only if epmd -kill is not possible

Change-Id: I34d108e50ddcca8b7d8f8222b0070cbc89ec0b12
Merge remote-tracking branch 'upstream/master'