Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Introduce a configuration to define time lapse for rate limiter

Change-Id: Ic00b5ba1ca95889e50b12823de1a7370915941c0