Merge "[DCAEGEN2] Update snmptrap-collector image"