Remove optional -suffix from selected object-ids in right plugin general tab
Removed duplicate object-ids from batch-annotate
Add explanation to remove_id_suffix function
Revert "Add explanation to remove_id_suffix function"

This reverts commit 4046ec6310c8a4fea7a0a758f852885bffb8fb98.
Revert "Removed duplicate object-ids from batch-annotate"

This reverts commit f7ea316d1d2d8d0069840d2badbf833c2153f5a6.
Revert "Remove optional -suffix from selected object-ids in right plugin general tab"

This reverts commit 28e927a69e6f29e9b4a6cb8e2a9bb16950b67dd6.
Handle extended IDs in OME.table_selection_changed
Use the reflected network check on non-Linux platforms

If it has been determined that the reflected check (i.e. using Java 1.6+
code) can be used, then try that first on non-Linux systems.  If it
returns false or cannot be run, then the original Java 1.5 is still
used.

This prevents the network from being detected as down on non-Linux
systems with Java 1.7.0-b27.

See #10824, #10838, and #11244.
Expand the use of the reflected network check (See gh-1345)

As in 4d15d08e89358d1c99363e4b3bba4a7b690809ea, if the reflected check
can be used rely in it.  Furthermore, we will also now make use of the
java.net.InetAddress.isLoopbackAddress() method (available since Java
1.4) rather than looping through each and every possible interface and
retrospectively performing a string comparison on the actual addresses.

Conflicts:

	components/insight/SRC/org/openmicroscopy/shoola/util/NetworkChecker.java
Add a testing main() to NetworkChecker

Conflicts:

	components/insight/SRC/org/openmicroscopy/shoola/util/NetworkChecker.java
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1326 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1338 (OMEROMetadataStoreClient: Complete unimplemented stubbed out methods)
merge develop -D org -I include -E exclude: PR 1339 (Rebased/dev 4 4/cli importer qa report dev 4 4)
merge develop -D org -I include -E exclude: PR 1341 (Refactor OMERO.matlab write data example (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1342 (Python code examples and scripts for Paris develop)
merge develop -D org -I include -E exclude: PR 1343 (script_ui ignores defaults if omero.model objects. See #11243 develop)
merge develop -D org -I include -E exclude: PR 1346 (Web image object id extension 11022 (rebased onto develop))