Merge "[AAI][SPARKY] Updating the sparky config"