Base version from eclipse branch of finna-be-bugfixes