Merge "Xenapi: Fix tempest for xenserver device tagging"