Fixes for Concept Choice NPE
Merge branch 'master' of https://github.com/europeana/corelib.git