Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev