Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Introduce a configuration to define time lapse for rate limiter Change-Id: I8a481a5ad77d0856879949627e92ae06295f449d