Fix JSON validation errors

Closes-Bug: #1283711

Change-Id: I3450ffbb52a1537630932969a536e480d193955c
author: diane fleming