Modulo stable

Commits from #587 now onto ```dev_4_4```

To test the PR, run 

```
./build.py -f components/tools/OmeroJava/build.xml test -DTEST=integration/MetadataServiceTest
```
and  (for missing XmlAnnotation support)

```
./build.py -f components/tools/OmeroJava/build.xml test -DTEST=integration/UpdateServiceTest
```