Refs #9458 - Make sure we don't trip up on added (histogram) data...

... when displaying masks.
Refs #9458 - Make sure we can add data with SANS2DTUBES option.
Merge remote-tracking branch 'origin/bugfix/9458_fix_display_mask_for_added_data'