Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (PUP-3277) Ensure that user and group are set in func4x test

acceptance/tests/loader/func4x_loadable_from_modules.rb

@@ -30,6 +30,13 @@
 
   # make sure that we use the modulepath from the dev environment
   puppetconf = get_test_file_path(agent, 'puppet.conf')
+  user = agent.puppet['user']
+  group = agent.puppet['group']
+  # Setting user/group ensures that when puppet apply's Configurer use()'s the
+  # settings, that it doesn't default to owning them as root, which can have an
+  # impact on following tests.
+  on agent, puppet("config", "set", "user", user, "--section", "main", "--config", puppetconf)
+  on agent, puppet("config", "set", "group", group, "--section", "main", "--config", puppetconf)
   on agent, puppet("config", "set", "environment", "dev", "--section", "user", "--config", puppetconf)
   on agent, puppet("config", "set", "environmentpath", envs_path, "--section", "main", "--config", puppetconf)