Merge "Use non-root user for Dockerfile of helm-manager"