Merge branch 'MDL-63839_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE

message/output/popup/tests/behat/message_popover_preferences.feature

@@ -1,4 +1,4 @@
-@message @message_popup
+@core_message @message_popup
 Feature: Message popover preferences
   In order to modify my message preferences
   As a user

message/output/popup/tests/behat/message_popover_unread.feature

@@ -1,4 +1,4 @@
-@message @message_popup @javascript
+@core_message @message_popup @javascript
 Feature: Message popover unread messages
   In order to be kept informed
   As a user

message/output/popup/tests/behat/notification_popover_preferences.feature

@@ -1,4 +1,4 @@
-@message @message_popup
+@core_message @message_popup
 Feature: Notification popover preferences
   In order to modify my notification preferences
   As a user

message/output/popup/tests/behat/notification_popover_unread.feature

@@ -1,4 +1,4 @@
-@message @message_popup @javascript
+@core_message @message_popup @javascript
 Feature: Notification popover unread notifications
   In order to be kept informed
   As a user

message/tests/behat/delete_all_messages.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Delete all messages
   In order to communicate with fellow users
   As a user

message/tests/behat/delete_messages.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Delete messages
   In order to communicate with fellow users
   As a user

message/tests/behat/manage_contacts.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Manage contacts
   In order to communicate with fellow users
   As a user

message/tests/behat/reply_message.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Reply message
   In order to communicate with fellow users
   As a user

message/tests/behat/search_messages.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Search messages
   In order to communicate with fellow users
   As a user

message/tests/behat/search_users.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Search users
   In order to communicate with fellow users
   As a user

message/tests/behat/update_messaging_preferences.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: Messaging preferences
   In order to be notified of messages
   As a user

message/tests/behat/view_messages.feature

@@ -1,4 +1,4 @@
-@core @message @javascript
+@core @core_message @javascript
 Feature: View messages
   In order to communicate with fellow users
   As a user