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

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