Merge "Clean up DCAE GEN 1 params from Heat template"