Removed m_hasInstrument, replaced with call to hasInstrument()

Refs #9691
Merge remote-tracking branch 'origin/bugfix/9691_maskworkspace_refactoring'