[bamboo] Automated branch merge (from foundation:05eac545c0faf33793202bee39d92ec81492f9f1)
[bamboo] Automated branch merge (from foundation:05eac545c0faf33793202bee39d92ec81492f9f1)

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