another fix to node_alive.py
fixed a bug in trigger_helper.py
Merge remote-tracking branch 'upstream/master'