Fix merge problems

Jira-issue: WP-1211
Fix indentation

Jira-issue: WP-1211
Merge pull request #17 from ccameroni/WP-1211-bis

WP-1211 add devices to setPolicy