Change CLI naming options (rebased)

See gh-2259 for details. Note that `bin/omero import -h` should now **not** show the deprecated options **at all**.

--rebased-from #2259