Merge "use encrypted auth for dmaap"

diff --cc bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
index 4d7c85e,d380536..fc69f81
--- 1/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
--- 2/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/dmaapproperties/GlobalDmaapPublisherTest.java
@@@ -31,12 -30,11 +31,12 @@@ public class GlobalDmaapPublisherTest e
  
        @Autowired
        private GlobalDmaapPublisher globalDmaapPublisher;
 -      
 +
 +
        @Test
        public void testGetters() {
-               assertEquals("dmaapUsername", globalDmaapPublisher.getUserName());
-               assertEquals("ZG1hYXBQYXNzd29yZA==", globalDmaapPublisher.getPassword());
+               assertEquals("81B7E3533B91A6706830611FB9A8ECE529BBCCE754B1F1520FA7C8698B42F97235BEFA993A387E664D6352C63A6185D68DA7F0B1D360637CBA102CB166E3E62C11EB1F75386D3506BCECE51E54", globalDmaapPublisher.getAuth());
+               assertEquals("07a7159d3bf51a0e53be7a8f89699be7", globalDmaapPublisher.getKey());
                assertEquals("com.att.mso.asyncStatusUpdate", globalDmaapPublisher.getTopic());
                assertEquals("http://localhost:" + wireMockPort, globalDmaapPublisher.getHost().get());
        }

diff --cc bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
Simple merge