Build fix
Build fix

Two recent merges stepped on each other. Resolving.

Signed-off-by: Aaron Lehmann <8ecfc6017a87905413dcd7d63696a2a4c351b604@docker.com>

vasil-yordanov/swarmkit,allencloud/swarmkit,AliyunContainerService/swarmkit,yp-engineering/swarmkit,runshenzhu/swarmkit,deljuven/swarmkit,sungwonh/swarmkit,alyyousuf7/swarmkit,yp-engineering/swarmkit,dperny/swarmkit-1,deljuven/swarmkit,fate-grand-order/swarmkit,elifa/swarmkit,RenaudWasTaken/swarmkit,AliyunContainerService/swarmkit,docker/swarmkit,vasil-yordanov/swarmkit,runshenzhu/swarmkit,docker/swarmkit,elifa/swarmkit,allencloud/swarmkit,diogomonica/swarmkit,Noyan759/swarmkit,cheyang/swarmkit,diogomonica/swarmkit,aaronlehmann/swarmkit,aaronlehmann/swarmkit,dperny/swarmkit-1,RenaudWasTaken/swarmkit,Noyan759/swarmkit,yongtang/swarmkit,fate-grand-order/swarmkit,jlhawn/swarmkit,sungwonh/swarmkit,cezarsa/swarmkit,cezarsa/swarmkit,jlhawn/swarmkit,yongtang/swarmkit,alyyousuf7/swarmkit,cheyang/swarmkit