Refs #17641 Destinet; code sync after server update

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@20637 a0171fae-0946-0410-966d-b1775066cd26
Refs #17641 Destinet; Fix tests

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@20638 a0171fae-0946-0410-966d-b1775066cd26