Merge "Add ODL + SLI container"