Rebased/develop/tags ns

see #804

Fix https://trac.openmicroscopy.org.uk/ome/ticket/10393

First clean and rebuild.
To test, run
```
./build.py -f components/tools/OmeroJava/build.xml test -DTEST=integration/UpdateServiceTest
```