Merge remote-tracking branch 'origin/feature/6978_muon'
Re #6907. First pass at making qt-assistant optional.
Re #6907. Making qt-assistant completely optional at runtime.

Also adding another place to check for the help file on a mac.
Merge branch 'bugfix/6907_qtassistant_mac' into develop