[bamboo] Automated branch merge (from foundation-2017:0d1aab9a515e24e25386b747c2d2b418d67f7788)
[bamboo] Automated branch merge (from foundation-2017:0d1aab9a515e24e25386b747c2d2b418d67f7788)

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