Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: Ib42a890ab15177803ad0eb20978c4038e11da15f
tree: 86c71be4172acc50aab014175fa88df9b2377464
  1. java/
  2. javatests/