xenopsd: Switch back to trunk

Signed-off-by: Euan Harris <euan.harris@citrix.com>
Merge pull request #356 from euanh/build-improvements

xenopsd: Switch back to trunk