replace unit with values, remove conditionalProperty

[rsnancollas]

I think I needed to nest the "valueOption" to get the additionalProperties field, but if you think I can make that an array at the top level, let me know