Merge "Remove default flavor from every template"

diff --cc cinder-storage.yaml
Simple merge

diff --cc compute.yaml
Simple merge

diff --cc controller.yaml
Simple merge

diff --cc nova-compute-instance.yaml
Simple merge

diff --cc overcloud-source.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
Simple merge