Merge "Change key of container manager from 'container-config' to 'containerConfig...