CLOUDIFY-2463 move properties back to node instance