Merge branch 'issue/stable/pup-3591-cherry-pick-fix-from-master' into stable
- issue/stable/pup-3591-cherry-pick-fix-from-master: (PUP-3591) Refactor get_facts to always return a hash (PUP-3391) Plugin synced for incorrect environment while agent is resolving environment