Latest system patch for grpc openonu-go jobs and helm chart updates

Change-Id: Ide288518c73624e3c76f1900b452c8d352c3f2df
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 30ad472..a0ae8cd 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -47,11 +47,10 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim-grpc'
           code-branch: 'master'
-          volthaHelmChartsChange: refs/changes/69/26569/8
-          volthaSystemTestsChange: refs/changes/58/27458/1
+          volthaHelmChartsChange: refs/changes/69/26569/9
           extraHelmFlags: >
             --set global.image_tag=master
-            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=port-remove
+            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple
             --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
             --set voltha.images.rw_core.tag=grpc_v1
             --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
@@ -243,10 +242,10 @@
           name: 'periodic-voltha-openonu-go-test-bbsim-grpc'
           code-branch: 'master'
           volthaHelmChartsChange: refs/changes/69/26569/9
-          volthaSystemTestsChange: refs/changes/32/27532/1
+          volthaSystemTestsChange: refs/changes/36/27536/1
           extraHelmFlags: >
             --set global.image_tag=master
-            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=port-remove
+            --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple
             --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
             --set voltha.images.rw_core.tag=grpc_v1
             --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go