Fix #9480: correct various selection issues with data browser.
Merge pull request #552 from will-moore/channel_naming_100022

Channel naming 100022
Fix Edit name of ''. See #10063
Empty description text unified: 'Add Description'. See #10064
metadata_general 'includes' Edit Description code.
metadata_general 'includes' Edit Name code.
Fix hiding of Name during editinline.

When editing Name (of Image, Project, Tag etc) the original Name wasn't hidden
so you got the edit box AND the Name above it. Now, the Name label is hidden
Fix style of editinplace Cancel button. See #10066
editinplace error doesn't disable 'Save' button. See #10060
Revert to 'Add Description' if empty. See #10061
ParametersI.h: Work around Ice bug in ParametersIPtr typedef
templates/combined.vm: Work around Ice bug in ${PojoI}Ptr typedef

I'm not happy with this patch.  The seemingly arbitrary escaping
of the leading '#' seems wrong, even if it does result in correct
generated output.  Is there a better way to do this?
Fix indentation in admin.py
Merge pull request #580 from jburel/import-error-handling

Improve error handling during import (See #10090)
Clean up test.
Check that all shapes types are imported.
merge dev_4_4 --exclude conflict needs-fixes broken: PR 526 (Fix #9480: prevent selection in data browser from selecting invisible im...)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 536 (Insight import location)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 538 (OMERO.tables ArrayColumns #5632)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 545 (Jshint compliance 9927)