Merge pull request #619 from rustyswayne/1.1.1

Moved NotificationMessageService back to internal on ServiceContext