Merge "Bind to the correct default container service when installing/moving/measuring pkgs" into jb-mr1-dev