[backport-1.4]: Cattle-agent pods are not properly deployed

Issue #2451 (closed) needs to be backported to 1.4.x