Issue #1979604: Update notify to use message_subscribe_send_message.
Revert "Issue #1979604: Update notify to use message_subscribe_send_message. per http://drupal.org/node/1979604#comment-7369046"

This reverts commit c5d065055133880b43f0a6f3543a810be6c661b3.
Merge branch '7.x-3.x' into trusted_contacts