Merging deegree master into csw-sorting-bug