use node.name System property
fix logs
Merge remote-tracking branch 'refs/remotes/origin/master'