Merge "AAF cert dist for DMaaP DR"

diff --cc kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index f6d6721,671b42f..21524ef
--- 1/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
--- 2/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@@ -67,10 -66,9 +67,10 @@@ spec
                port: {{ .Values.service.externalPort }}
              initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
              periodSeconds: {{ .Values.readiness.periodSeconds }}
 +            timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
            env:
            - name: enableCadi
-             value: "true"
+             value: "{{ .Values.global.aafEnabled }}"
            volumeMounts:
            - mountPath: /etc/localtime
              name: localtime