Merge pull request #353 from euanh/build-improvements

blktap: Switch to upstream source repository
Merge pull request #355 from euanh/build-improvements

xenopsd: Update to 0.9.34
xenopsd: Switch back to trunk

Signed-off-by: Euan Harris <euan.harris@citrix.com>