merge in jb-release history after reset to master
tree: 472513e69b465198bc749522af35adb98776e3ab
  1. java/
  2. jni/