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