Merge "[DMAAP-BC] Fix jjb failure"