Don't overwrite System properties (see #10828).
Merge pull request #1201 from bpindelski/data-dir

Fix omero.data.dir ignored in current develop branch (see #10828)