Use `two_factor_enabled?` instead of `otp_required_for_login?`
Preventing a merge conflict after gitlab-org/gitlab-ce!2688 is merged.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Preventing a merge conflict after gitlab-org/gitlab-ce!2688 is merged.