[Bug 907584] zeromq: Can't update due to file conflict