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