[rhq-project/rhq] 740391: Bug 1127413 + Bug 1127412