Merge "Add .cfg suffix on build node file for consistency"