Refs #18069 Naaya; cleanup in code

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@20706 a0171fae-0946-0410-966d-b1775066cd26
Prepare for egg release

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