Test latest nbd

The trunk-ring3 branch is used by XenServer internal testing, merging this PR will therefore cause the latest version to be tested.

This is a prerequisite of the vhd-tool change needed for vhf import/export.