[bamboo] Automated branch merge (from foundation-2018:6b971d07c020a02beaf3db64d251a5e250727fcc)
[bamboo] Automated branch merge (from foundation-2018:6b971d07c020a02beaf3db64d251a5e250727fcc)

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