Removed m_hasInstrument, replaced with call to hasInstrument()

Refs #9691
Merge branch 'bugfix/9691_maskworkspace_refactoring' into develop