Merge changes Ie1eb63dc,Ib7cc4d52

* changes:
  Renames setCallbackOnComplete method in ContextHubTransaction
  Rename ContextHubTransaction.Result IntDef