Merge "Update standard xApp helm chart"