Merge pull request #17662 from calavera/decouple_container_and_daemon

Remove daemon field from within container.