Merge branch 'stable-3.2'

* stable-3.2:
  Upgrade metrics-graphite to 4.1.12.1

Change-Id: I29d327cc62e08f85706823070a79212faad5b9c5