Refs #6787. Changing behavior of mask file override.

The new behavior allows for a mask file to be specified rather than a
directory.
Merge remote branch 'origin/bugfix/6787_basisred_mask_fix'