move server_tokens directive in config template
Merge branch 'more-attrs'