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

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