Fix NPE
Merge branch 'newruntime' of github.com:NGDATA/lilyproject into newruntime
Remove defunct container-api