Merge "Update vFW Heat Template for CDS use"