Merge "Use of .yaml extension instead of .yml for consistency."