Merge remote-tracking branch 'origin/feature/9887_fix_custom_dialogs'
Merge remote-tracking branch 'origin/feature/9857_MaskBTP_components'
Added equality and inequality opertors to Unit

Refs #5977
Merge branch 'bugfix/5977_unit_equals_operator' into develop