Merge "Add support to resolve docker container names for clustering support. Currentl...