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