Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Turn off autoReindexIfStale by default

Change-Id: I3f3ad4323887166ebe7ff95c468385aae8f9f21c