Merge branch 'master' into docs-5.1

docs/sources/features/datasources/postgres.md

@@ -273,7 +273,8 @@ datasources:
     url: localhost:5432
     database: grafana
     user: grafana
-    password: password
+    secureJsonData:
+      password: "Password!"
     jsonData:
       sslmode: "disable" # disable/require/verify-ca/verify-full