Update versions to match EAP/WFK
Update Shrinkwrap resolver to match WFK 2.3