Allow container path to change across restarts

The purpose of this change is to prepare for using container id in physical
container paths, and to ensure that this does not break live containers.
Use container ID in container path