[bamboo] Automated branch merge (from release-19.0.0:b15bdde83f43d3b6c0564a359ae3a8bf43b94071)
[bamboo] Automated branch merge (from release-19.0.0:b15bdde83f43d3b6c0564a359ae3a8bf43b94071)

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