Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Turn off autoReindexIfStale by default

Change-Id: I15639266b723ff2df7a62982dd43a5a6b1026430