* upstream/5.5.x:
  (packaging) Updating the puppet.pot file
  (PUP-10511) fix resource array with sensitive parameters
  (PUP-9251) Deprecate export & consume metaparameters
  (PUP-9251) Deprecate `environment` REST API
  (PUP-9251) Deprecate apporch environment catalog
  (PUP-10536) strip after wide terminator
  (PUP-8922) update permision for state files
  (PUP-9251) Update app orchestration link
  (PUP-9251) Deprecate application orchestration constructs

* Conflicts:
- lib/puppet/pops/validation/validator_factory_4_0.rb (mismatch in
  whitespace)