Merge branch 'feature/1710-consolidate-instance-info' into 'develop'

Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430

test/web/mastodon_api/controllers/instance_controller_test.exs

@@ -34,6 +34,10 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
              "banner_upload_limit" => _
            } = result
 
+    assert result["pleroma"]["metadata"]["features"]
+    assert result["pleroma"]["metadata"]["federation"]
+    assert result["pleroma"]["vapid_public_key"]
+
     assert email == from_config_email
   end