Merge "fix vnfsdk containers for oom"