Fixes related to vars shared among PM instances

Removed shared variables.
Added a method to update policy version after save.

Jira issue: WP-1167