Backport #85 and #86 upstream PRs#19

sgerag merged 2 commits into

xcp-ng-rpms:8.3xcp-ng-rpms/xsconsole:8.3from

sgerag:mastersgerag/xsconsole-rpms:masterCopy head branch name to clipboard