SWITCHYARD-1336 Update SY schema to allow for non-string types to be replaced with properties

support integer and long for now
SWITCHYARD-1345: Context properties not scoped or labeled properly in ContextMappers
Merge remote-tracking branch 'upstream/master'