Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092

Conflicts:
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	spec/mailers/notify_spec.rb