Switch back to upstream d-g now it supports xenserver

Include a fudge to import pyyaml as it's not clear why it's not there

Change-Id: Ia59e0218c7851232edb9deae8555c1f232c8eeb3
Merge "Switch back to upstream d-g now it supports xenserver"