Merging with release/pebbles/pending
Adding auto assigning for xen role