Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix Quota rest rate limiter support

Change-Id: I802af8a12ac0128e04e75b5aa2e575a1d3f975d6