Fix indentation in the security model document

This PR also contains commits from other PRs.