xdi2 client library related changes