SWITCHYARD-1345: Context properties not scoped or labeled properly in ContextMappers

SWITCHYARD-1345: Context properties not scoped or labeled properly in ContextMappers
https://issues.jboss.org/browse/SWITCHYARD-1345