code clean up

git-svn-id: https://svn.apache.org/repos/asf/chemistry/opencmis/trunk@1497981 13f79535-47bb-0310-9956-ffa450edef68
Workbench: fixed Java 6 build

git-svn-id: https://svn.apache.org/repos/asf/chemistry/opencmis/trunk@1497985 13f79535-47bb-0310-9956-ffa450edef68
more code clean up

git-svn-id: https://svn.apache.org/repos/asf/chemistry/opencmis/trunk@1498002 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk