[rhq] 2 commits - etc/m2