3.2 pre8 backport

Backports:

*  https://github.com/deegree/deegree3/pull/26
*  https://github.com/deegree/deegree3/pull/25