fix merge between onelab and princeton repositories

No match.