Fix the null URI versus "null" versus Json.NULL

Change-Id: I51d3683d6c0f637689aded58bba95fdec9dbe8ce
6 files changed