Had to rewrite the Docker control net init code in the case of
!$USE_MACVLAN_CNET (i.e. use bridge for control net) and
!$ISREMOTENODE.  To sum up, there was yet another case I hadn't thought
a problem where Docker cannot handle our setup of the bridge (where we
set the real control net IP as the primary ip, and the virt control net
IP as an alias).  See comments in commit for more detail.

Hopefully this is the last case.