Merge pull request #429 from hflynn/FS_tidy_dev_4_4

OMERO.fs tidy dev_4_4
merge dev_4_4 -D org -I include -E exclude: PR 368 (Cpp: Correct content and markup)