CLOUDIFY-1927 fix dsl according to new policies