CLOUDIFY-2426 add node_id as service property to node rules
CLOUDIFY-2426 only add service if needed
Merge pull request #8 from CloudifySource/feature/feature/CLOUDIFY-2426-simplify-policies

Simplify policies