Merge pull request #469 from BobBall/xenstored-fix

Jessie fixes
Revert 59b6ff4db88e500480f502b9cdf17274601bbe34; was Ubuntu specific