CLOUDIFY-2421 remove app name from node_id and add node name to node