[bamboo] Automated branch merge (from foundation-2016:7b48df56145d8bced9c2d5d6c3763e58d0f9e2d2)
[bamboo] Automated branch merge (from foundation-2016:7b48df56145d8bced9c2d5d6c3763e58d0f9e2d2)

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