Merge "Bug 4734 - netvirt/GatewayMacResolverService: null pinter exception"