Merge "Fix bug 153: change the key container-config to ContainerConfig in the contain...