Removed usage of deprecated method
Replaced all getXyAsZ() with getXy(UnitsZ) in the Pojos
Make use of the Pojos getXy(UnitsZ) methods
Replaced the last calls to deprecated non-unit methods
Merge pull request #3227 from joshmoore/units-conversion

Conversion code for Java/Python
merge develop -Dorg -Ssuccess-only: PR 3156 (Templates cleanup)
merge develop -Dorg -Ssuccess-only: PR 3157 (Reset password)
merge develop -Dorg -Ssuccess-only: PR 3207 (General pane web 2)
merge develop -Dorg -Ssuccess-only: PR 3208 (Update the OMERO install script to test Web login with CSRF (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3215 (5.1DEV__16: Ordered Map implementation)
merge develop -Dorg -Ssuccess-only: PR 3217 (Viewer fixes)
merge develop -Dorg -Ssuccess-only: PR 3218 (Units metadata panel)
merge develop -Dorg -Ssuccess-only: PR 3221 (Wrap description text to avoid horizontal scroll bar)
merge develop -Dorg -Ssuccess-only: PR 3222 (Initial draft for m2 version history)
merge develop -Dorg -Ssuccess-only: PR 3228 (fix #11779: graph operations use "compiler" rather than "rollback" strategy)
merge develop -Dorg -Ssuccess-only: PR 3236 (Fix 'Save to All' in Preview panel)
merge develop -Dorg -Ssuccess-only: PR 3237 (Fix web attachment error msg develop)
merge develop -Dorg -Ssuccess-only: PR 3239 (Flake8 top-level OmeroWeb components)
merge develop -Dorg -Ssuccess-only: PR 3240 (Insight units followup)
merge develop -Dorg -Ssuccess-only: PR 3243 (Update develop submodules)