SWITCHYARD-1025 Inaccurate consumer metadata for services with multiple bindings
Merge remote-tracking branch 'upstream/master'