[bamboo] Automated branch merge (from foundation-2017:6ae840b378aa3a6930b5b161eabc69595f7b2370)
[bamboo] Automated branch merge (from foundation-2017:6ae840b378aa3a6930b5b161eabc69595f7b2370)

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