[bamboo] Automated branch merge (from foundation-2016:80ad372059ec4f50f7da29a64d8645b36f3063eb)
[bamboo] Automated branch merge (from foundation-2016:80ad372059ec4f50f7da29a64d8645b36f3063eb)

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