Merge changes I5085318d,Id1901d5a into udc-dev

* changes:
  Make checkin client testable
  Handle check-in reponse