CLOUDIFY-1755 Merged NIC_ADDR fix from 2.6.0