Merge "resource-agents: upgrade to 4.1.1 and align with stx 3.0"