* Port #6578 to Helm 3 Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com> * Update after reviw Review comments: - https://github.com/helm/helm/pull/6611#discussion_r332745703 Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>