modified:   bootstrap/java_updator.sh
Merge branch 'master' of https://github.com/voyiger/node_kpi
ok

Conflicts:
	bootstrap/java_updator.sh