Bug/grains virtual xen

This commit fixes #13534 - This should probably also be merged into develop.