Merge branch 'release/1.15.04' into develop
Update import to use BBSMSHandler.
Update version to 1.15.05
Merge branch 'hotfix/#831_App_errors_when_attempting_to_configure_email_settings' into develop
Merge branch 'hotfix/#831_App_errors_when_attempting_to_configure_email_settings'
Merge branch 'release/1.15.05'