Proper JSON handling of strings that could be represented as other types

Addresses #6830

Docker-DCO-1.1-Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com (github: estesp)