ND2: only parse text blocks that match the final set of images
Expand list of keys used for determining pixel type
ND2: allow the "Dimensions" text entry to be in multiple languages
ND2: one more round of fixes for text block parsing
Allow dimensions in text blocks to be ignored
Fix text block ordering
Fix uint16 pixel type correction
Fix develop-specific compile error
Merge pull request #1254 from melissalinkert/rebased/develop/nd2-blocker

ND2: one more set of dimension parsing fixes (rebased onto develop)