Fix master build
Fix master build

Two incompatible changes were merged. Fixing.

Signed-off-by: Aaron Lehmann <b9d749ea9a65ae80fa8907e2f6e53a17ebff821c@vitelus.com>

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