Bug 917740 - Integrate single variant conf files in variant.json