[bamboo] Automated branch merge (from foundation-2017:5515795947c019490af3fdbe3ed56b4ecd42c371)
[bamboo] Automated branch merge (from foundation-2017:5515795947c019490af3fdbe3ed56b4ecd42c371)

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