Simple doc, Makefile, and cherry-pick error fixes.

`server_cfengine_policy` is a local variable of `StartServer`; there is no way `main` can know about it, much less tidy it away.  Of course, `main` has its own policy, which it does tidy away, but that's entirely independent.