Rebind policy fixes
Merge pull request #1419 from aledsage/fix/policy-persistence-20140527

Fixes in policy persistence (against branch feature/policy-persistence)