3.2 pre8 backport

Additional commit backported: 

https://github.com/deegree/deegree3/pull/25