Some search path differences are appropriate here (e.g. not looking for production host name matches) but we have some other differences that seem to be historical or accidental mistakes. Making things more similar would certainly reduce accidental breakages when changes are made in either realm.
- prod uses nuyaml3, cloud uses nuyaml1 There might have been a reason to not upgrade cloud puppetmasters at the time, but there's no reason to think that reason persists.
- prod uses expand_paths in the common/ subdir, cloud-vps does not. https://gerrit.wikimedia.org/r/#/q/69e55590c178c585fafe7e691db6da25e93ee248