Update to point to new xdi2 and sdk versions