Ensure we're compatible with JSONSchema 1.3.0 through 2.2.0

Change-Id: I551241c84112727eb55b0fb65f97fd532f064207