Merge branch 'ticket-475' into pdok
Merge branch 'ticket-476' into pdok
Merge remote-tracking branch 'origin/pdok' into pdok
Merge remote-tracking branch 'deegree/master' into pdok
Merge remote-tracking branch 'deegree/master' into pdok
Merge remote-tracking branch 'deegree/master' into pdok
Merge remote-tracking branch 'origin/ticket-484' into pdok
Merge branch 'wms-metadata-subdirectory-fix' into pdok
Merge branch 'xpath-evaluation-nullpointer-fix' into pdok
Merge branch 'wms-authority-url-support' into pdok
Merge branch 'wms-authority-url-support' into pdok
Merge branch 'wms-authority-url-support' into pdok
Merge remote-tracking branch 'deegree/master'
Merge branch 'integration-test-fixes'
Merge remote-tracking branch 'deegree/master'
Merge remote-tracking branch 'deegree/master'
Merge remote-tracking branch 'deegree/master'
Merge branch 'update-dependencies'
Merge branch 'update-dependencies'
Fixed test regression after bumping axiom version