Cherry-pick openrc-related fixes

Commits from !6474 (merged) and !6476 (merged)

Merge request reports

Loading
Loading