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

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