tree 34f29107a1afd3ece64bea404374e780b1682992
parent 76de238eadaecf8555aca7dadf5114275c01baa1
parent da85700b910174095127a73637d1caf130ac283b
author Marco Miller <marco.miller@ericsson.com> 1558733258 -0400
committer Marco Miller <marco.miller@ericsson.com> 1558733275 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Refactor json handling for simplicity and maintainability

Change-Id: Ia02a8956a9f004422a1c5292a5c7ea745d3166f6