Merge pull request #623 from wallyworld/container-startup

Container startup tweaks

Maybe fixes: https://bugs.launchpad.net/juju-core/+bug/1362360

We need extra debugging to see what's going on. Deferring the stopping of the worker might help.