Added workaround to fix order

- policy sets order fixed
- policies order fixed

Jira-issue: WP-1261
Fixed policy sets and policies order

Removed workaround and implemented permanent solution

Jira-issue: WP-1261
Merge pull request #21 from ccameroni/WP-1261-policysets-and-policies-order

WP-1261 policysets and policies order