Some checks and corrections for java node
Merge branch 'dev-mayanks43' into dev-dsathe
More code standard work