Bring in fix for OS-265 (Network failure)
Bring in fix for OS-265 (Network failure)

We really need to be building platform from the release branch.
Next time.

kaizengarden/sdc-headnode,joyent/sdc-headnode,numericillustration/sdc-headnode,numericillustration/sdc-headnode,kaizengarden/sdc-headnode,kaizengarden/sdc-headnode,kaizengarden/sdc-headnode,joyent/sdc-headnode,joyent/sdc-headnode,numericillustration/sdc-headnode,joyent/sdc-headnode