Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ie63b70cfdf46b2ba997eab1357f3be52ee650814