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