Add name generator for container without -name Upstream-commit: c0662488c75096c94411be370010ae6a0230be8d Component: engine