Merge master back into 52North after merging WPS-3.1.0-SNAPSHOT

Tom, Benjamin, Matthias,

please review this Pull Request basically dealing with the merge of the maintenance branch. I had to do some manual adjustments. Basically I have used InputHandler and strategy/* as the resolution for the resources leaking / timeout issues.