Add admonition type to shortcode (#9482)

* Change existing admon blocks

* Fix includes issue

content/en/docs/setup/scratch.md

@@ -487,11 +487,11 @@ You will need to run one or more instances of etcd.
   - Not highly available, but easy to restore - Run one etcd instance, with its log written to a directory backed
     by durable storage (RAID, GCE PD).
     
-    {{< note >}}**Note:** May result in operations outages in case of
+    {{< note >}}May result in operations outages in case of
     instance outage. {{< /note >}}
   - Highly available - Run 3 or 5 etcd instances with non durable storage.
   
-    {{< note >}}**Note:** Log can be written to non-durable storage
+    {{< note >}}Log can be written to non-durable storage
     because storage is replicated.{{< /note >}}
 
 See [cluster-troubleshooting](/docs/admin/cluster-troubleshooting/) for more discussion on factors affecting cluster