merge relevant required commits from the 1.1 branch up to 640209 (629426, 630144, 630180, 630184, 640196, 640209) - more to come from the 1.1 release and the 1.1.1 release

git-svn-id: https://svn.apache.org/repos/asf/tuscany/java/sdo@680330 13f79535-47bb-0310-9956-ffa450edef68
19 files changed