Heinrich returning to Porsche Penske, Müller in at JDC-Miller for Indy