Fix some ansible-lint-reported warnings

This mostly fixes `key-order` warnings around
`block` statements.

.config/ansible-lint.yml

@@ -9,5 +9,8 @@ skip_list:
   - schema
   - command-instead-of-shell
   - role-name
+  # We frequently load configuration from a template (into a variable), then merge that with another variable (configuration extension)
+  # before finally dumping it to a file.
+  - template-instead-of-copy
 
 offline: false