Merge branch 'stable-2.15'

* stable-2.15:
  Fix invalid json in REST documentation

Change-Id: I6ed6f44e2a47cc9d4088d0ab9e4ea6f529e38d95