Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Simplify Init for Elasticsearch
  Refactor reindexProjects in Init to be general
  Avoid auto-reindex of projects during init when unneeded

Change-Id: Id945a48cebe8408e86e3c4025fc6fbb1cb09bdc6
tree: 19f806df9db4f998c2f5bf6ab1df1688f7aee817
  1. java/
  2. javatests/