Merge branch 'stable'

• stable: (maint) Fix acceptance test using cached catalog (PUP-3591) Refactor get_facts to always return a hash (PUP-3391) Plugin synced for incorrect environment while agent is resolving environment

Conflicts:
acceptance/tests/environment/enc_nonexistent_directory_environment.rb