[rhq-project/rhq] 553d53: [BZ 1069545] Fix type merging to support updates t...