xapi: Update to 1.9.50, completing the merge back to master

Signed-off-by: Euan Harris <euan.harris@citrix.com>