Merge "[DCAEGEN2] Update cm-container and consul-loader"