ND2: populate the channel color

Fixes #10530.
ND2: fix T size adjustment

Fixes #10526.

Conflicts:

	components/bio-formats/src/loci/formats/in/NativeND2Reader.java
Fix compile errors
Merge remote-tracking branch 'origin/develop' into rebased/develop/more-nd2-fixes

Conflicts:
	components/bio-formats/src/loci/formats/in/ND2Handler.java
	components/bio-formats/src/loci/formats/in/NativeND2Reader.java
Merge pull request #433 from melissalinkert/rebased/develop/more-nd2-fixes

More .nd2 fixes (rebased onto develop)