Merge pull request #691 from anirban-c/master

xen: Fix build break in agent code
xen: Fix build warning

Signed-off-by: Anirban Chakraborty <abchak@juniper.net>