This mostly fixes `key-order` warnings around `block` statements.
Reason: during a fresh install, when there is no synapse yet, systemd unit fails to start, thus whole play fails
Co-authored-by: Slavi Pantaleev <slavi@devture.com>