TEZ-585. Unify code path for reused and new containers (bikas)