Added changes suggested in pull review
Added changes suggested in pull review

srowe/xen-api,srowe/xen-api,srowe/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,euanh/xen-api,srowe/xen-api,euanh/xen-api,srowe/xen-api