Add enricher memento for rebind
More enricher and policy persistance changes
Merge pull request #1416 from aledsage/feature/policy-enricher-memento

policy enricher memento