Add settings.xml used by AetherGrapeEngineTests
Merge branch '1.1.x'