Move the ZEROMQ_BRANCH AND NANOMSG_BRANCH progress defines higher.
Update the header files for nanomsg.