Merge branch 'namedb-leak' into 'master'

Namedb leak

Fixes the possible leak of not closing the DB environment.

Note: There's a race condition on the 'if' - threads may avoid closing the env anyway.
To fix that we'd need to introduce locks to namedb.

See merge request !339