Merge "Initial CSIT framework for dmaap/buscontroller"