This also adds keys to supply master_flavor_id to cluster creation, as this might be reuqired if flavor is not supplied for template Change-Id: Iabbbd2b8366ea693c78d3845f0cb55413b0da125