MOb-22: Quick fix for modal
Merge branch 'MOB-22-Quick-fix-for-modal' into dev
MOM-22: Some jshinting
(cherry picked from commit e9ab2db)