Refactor discussion of management.security.*

Really fixes gh-595