[bamboo] Automated branch merge (from foundation:249c6660a5df48c789ee7ba4060f509f06973711)
[bamboo] Automated branch merge (from foundation:249c6660a5df48c789ee7ba4060f509f06973711)

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