McKenna to take over infrastructure file after four contentious years on environment