Merge commits r996988, r996991, r996994, r996998, r997259 and r997886 from 1.6.1 branch (TUSCANY-3676)

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