TUSCANY-3449: Merge r903639 and r904353 from 1.6 branch

git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027278 13f79535-47bb-0310-9956-ffa450edef68
7 files changed