Fixed JSON syntax errors from branch merge conflict resolution.
Fixed JSON syntax errors from branch merge conflict resolution.

ozone-development/ozp-controller-node,ozone-development/ozp-controller-node