Merge branch 'master' into imountpoint-ocp-storage

diff --cc apps/files_sharing/lib/SharedStorage.php
Simple merge

diff --cc lib/private/Files/Storage/Storage.php
Simple merge

diff --cc lib/private/Files/Storage/Wrapper/Jail.php
Simple merge

diff --cc lib/private/Files/Storage/Wrapper/Wrapper.php
Simple merge

diff --cc lib/public/Files/Mount/IMountPoint.php
index 9b55c76445171b41ef1fd6a29f42f680be08ff5f,8419cc781fcf8c6f873f917147ced9984d8c8794..601f293fc16f3f49bb1024ecd84cc4b98bc235e2
--- 1/lib/public/Files/Mount/IMountPoint.php
--- 2/lib/public/Files/Mount/IMountPoint.php
+++ b/lib/public/Files/Mount/IMountPoint.php
@@@ -48,7 -48,7 +48,7 @@@ interface IMountPoint 
        /**
         * Get the storage that is mounted
         *
-        * @return \OCP\Files\Storage\IStorage
 -       * @return \OC\Files\Storage\Storage|null
++       * @return \OCP\Files\Storage\IStorage|null
         * @since 8.0.0
         */
        public function getStorage();

diff --cc lib/public/Files/Storage/IStorage.php
Simple merge