Merge branch 'platform-health' of https://github.com/andrewbess/magento2 into CE-33568-update-phpmd-to-latest-version

� Conflicts:
�	composer.lock

Author: andrewbess

composer.json

@@ -25,6 +25,7 @@
         "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
         "ext-soap": "*",
+        "ext-sodium": "*",
         "ext-xsl": "*",
         "ext-zip": "*",
         "lib-libxml": "*",
@@ -63,7 +64,6 @@
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
-        "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^5.0.0",
         "php-amqplib/php-amqplib": "~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",

composer.lock

@@ -20,6 +20,7 @@
         "ext-intl": "*",
         "ext-openssl": "*",
         "ext-simplexml": "*",
+        "ext-sodium": "*",
         "ext-xsl": "*",
         "lib-libxml": "*",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",