[ELF-111] more fixes to get to the *point*
Merge branch 'master' of https://github.com/nls-jajuko/oskari-env