WP-1211 add devices to setPolicy

http://jira.webinos.org/browse/WP-1211

Fix merge problems