Incremental commit: attempt to fix the watching code after the xenstore client merge
Incremental commit: attempt to fix the watching code after the xenstore client merge

cheng--zhang/xenopsd,thomassa/xenopsd,djs55/xenopsd,djs55/xenopsd,djs55/xenopsd-previous,simonjbeaumont/xenopsd,simonjbeaumont/xenopsd,koushikcgit/xenopsd,thomassa/xenopsd,euanh/xenopsd,johnelse/xenopsd,euanh/xenopsd,simonjbeaumont/xenopsd,johnelse/xenopsd,euanh/xenopsd,koushikcgit/xenopsd,cheng--zhang/xenopsd,djs55/xenopsd,johnelse/xenopsd,cheng--zhang/xenopsd,thomassa/xenopsd,djs55/xenopsd-previous,djs55/xenopsd-previous,koushikcgit/xenopsd