[bamboo] Automated branch merge (from foundation:ad13db301d6388671b47bde46125294fc52d3c38)
[bamboo] Automated branch merge (from foundation:ad13db301d6388671b47bde46125294fc52d3c38)

aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms