If --private-ip-address is specified with any other options that require the creation of a NetworkInterfaces structure, move the value of --private-ip-address into the NetworkInterfaces structure.  Fixes #520.