Merge "Add Savanna-related configs for testing"