Merge "Fixed so that DMAAP client uses https"