Merge remote-tracking branch 'origin/1.5.x' into fix-smtp-provider-update

# Conflicts:
#	tests/e2e/Services/Messaging/MessagingBase.php

tests/e2e/Services/GraphQL/MessagingTest.php

@@ -138,8 +138,8 @@ class MessagingTest extends Scope
             'Telesign' => [
                 'providerId' => $providers[3]['_id'],
                 'name' => 'Telesign2',
-                'username' => 'my-username',
-                'password' => 'my-password',
+                'customerId' => 'my-username',
+                'apiKey' => 'my-password',
             ],
             'Textmagic' => [
                 'providerId' => $providers[4]['_id'],

tests/e2e/Services/Messaging/MessagingBase.php

@@ -51,8 +51,8 @@ trait MessagingBase
             'telesign' => [
                 'providerId' => ID::unique(),
                 'name' => 'Telesign1',
-                'username' => 'my-username',
-                'password' => 'my-password',
+                'customerId' => 'my-username',
+                'apiKey' => 'my-password',
                 'from' => '+123456789',
             ],
             'textmagic' => [
@@ -142,8 +142,8 @@ trait MessagingBase
             ],
             'telesign' => [
                 'name' => 'Telesign2',
-                'username' => 'my-username',
-                'password' => 'my-password',
+                'customerId' => 'my-username',
+                'apiKey' => 'my-password',
             ],
             'textmagic' => [
                 'name' => 'Textmagic2',