Merge pull request #145 from dirkmueller/release/stoney/master

Raise server/client timeouts to 3h (bnc#897902)
Remove trailing whitespace

(cherry picked from commit 3779483ab916e04cd02b7c90ce8b0b9de4740fdb)
Raise header bufsize to 32kb (bnc#900950)

It seems with multiple regions, the 24kb header size for
PKI tokens are exhausted pretty quickly. Raise to 32kb.
maxrewrite would be raised by that by default to 16kb, but
we don't need such a high value (since we don't rewrite
any of the large headers). So keep it at 8kb.

(cherry picked from commit 6a6f121cbb90260ad1fac804da3361b44eb35b11)