Merge pull request #389 from hflynn/omero_plone5

Updating omero_plone links to point at OME 5 product pages
Unify the use of "line".
add note about finality of deletion

see https://trac.openmicroscopy.org.uk/ome/ticket/10932#comment:9
Correct use of "becomes".
Merge pull request #391 from bpindelski/srvr-upgrd2

Change instances of 'OMERO.fs' to code version numbers
merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 386 (Update download link in read me)
merge develop -D org -I include -E exclude: PR 392 (add note about finality of deletion)