Fixes to broken confs and container handling.
Merge branch 'master' of https://github.com/Tietoarkisto/metka