Fixes #4607: Fix check-rudder-agent conditions on UUID creation
Merge pull request #260 from Kegeruneku/bug_4607/dev/4607_fix_check_rudder_agent_uuid_creation

Fixes #4607: Fix check-rudder-agent conditions on UUID creation
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9