Merge branch 'stable-3.2'

* stable-3.2:
  Adapt tests to compact JSON

Change-Id: If373812592f9aee7adb387bf754df30009bed203