Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix Quota rest rate limiter support

Change-Id: Ib83ceba1ecd42a1cb0bb09575e242d244b0ce78c