Code review fixes
Add license to Java files
VersionNode property merge optimization option 2