[bamboo] Automated branch merge (from release-21.1.1:970f56d318c2ed12508cc2095c06f1f47632c56a)
[bamboo] Automated branch merge (from release-21.1.1:970f56d318c2ed12508cc2095c06f1f47632c56a)

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