clean up resetPassword method.
Load LDAP details for logged in user.
Display message when password is changed.
Display LDAP info when selecting user from admin view.
Do not allow edit of login name if LDAP != null.
Add method to check if the user is LDAP user.
Add method indicating if LDAP user.
Blitz methods with units=True return omero.model.LengthI() etc not tuple
gatewaytest assertUnits() expects omero.model.LengthI() etc
Merge pull request #3255 from manics/tables_headers-12608

Return column descriptions in tables.getHeaders()
Merge pull request #3240 from dominikl/insight_units_followup

Insight units followup
Use units within ROIs

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java
Integrated units objects furthermore

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/metadata/editor/PropertiesUI.java

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java
Had to move UnitType to package util.ui
Code formatting, removing of unused imports
Handle the case that there is no pixelsize given

In that case, just sets 1px as pixel size

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java
Use unit symbols from API
Test that Blitz methods with units=True return None if unset
Ignore units on FontSize in shapeMarshall
Use lookupSymbol() method from api