Merge "Add R2 heat deployment of DCAE"