Merge pull request #144 from dirkmueller/master

Raise server/client timeouts to 3h
Remove trailing whitespace
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.