Merge "Update startODL based on changes to docker start"