Merge remote-tracking branch 'upstream/2021.06-rc' into proxy2

diff --cc src/Model/Storage/ExternalResource.php
index 69df7b9b203007a689d885af8b926481f1b6d3ee,8d1aded1516bbe7834a423933fafe4c659e55c29..5c78e6d546360c2fe035cd78266b8a8ee99c81af
--- 1/src/Model/Storage/ExternalResource.php
--- 2/src/Model/Storage/ExternalResource.php
+++ b/src/Model/Storage/ExternalResource.php
@@@ -22,7 -22,7 +22,8 @@@
  namespace Friendica\Model\Storage;
  
  use BadMethodCallException;
 +use Friendica\Util\HTTPSignature;
+ use Friendica\Network\IHTTPRequest;
  
  /**
   * External resource storage class