Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Make the index striped locks size configurable

Change-Id: Id50b81a6fb7b9862c7ff8b89f798a8d47b79788f